diff options
| author | Viktor Trón <viktor.tron@gmail.com> | 2016-11-28 20:29:33 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2016-11-28 20:29:33 +0800 |
| commit | e949a2ed2f1c59ed5ff1f187ad987c882656e6ef (patch) | |
| tree | 836c8b977ef61ddbc8163f70cbed118825822cbe /swarm/swarm.go | |
| parent | 8d0108fc5df81c71010b9dfb11a5db5658fcb80a (diff) | |
| download | go-tangerine-e949a2ed2f1c59ed5ff1f187ad987c882656e6ef.tar go-tangerine-e949a2ed2f1c59ed5ff1f187ad987c882656e6ef.tar.gz go-tangerine-e949a2ed2f1c59ed5ff1f187ad987c882656e6ef.tar.bz2 go-tangerine-e949a2ed2f1c59ed5ff1f187ad987c882656e6ef.tar.lz go-tangerine-e949a2ed2f1c59ed5ff1f187ad987c882656e6ef.tar.xz go-tangerine-e949a2ed2f1c59ed5ff1f187ad987c882656e6ef.tar.zst go-tangerine-e949a2ed2f1c59ed5ff1f187ad987c882656e6ef.zip | |
cmd/bzzd: swarm daemon fixes (#3359)
* cmd/bzzd: add missing p2p/discovery flags
* cmd/bzzd: fix two bugs crashing bzzd if bootnodes flag given
* cmd/bzzd: make no swap default, renamed flag bzznoswap->bzzswap
* internal/web3ext: correct methods for bzz IPC module
* cmd/bzzd: ethapi param not mandatory. Warning if no blockchain
* cmd/bzzd: correct default IPC modules in help string
* cmd/utils: fix help description for networkId - add Ropsten
* cmd/bzz, swarm/api, swarm/network: add swarm networkId flag
* cmd/bzzd: change nosync flag to sync and BootTFlag
Diffstat (limited to 'swarm/swarm.go')
| -rw-r--r-- | swarm/swarm.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swarm/swarm.go b/swarm/swarm.go index 1dce8cafd..7e38944de 100644 --- a/swarm/swarm.go +++ b/swarm/swarm.go @@ -209,7 +209,7 @@ func (self *Swarm) Stop() error { // implements the node.Service interface func (self *Swarm) Protocols() []p2p.Protocol { - proto, err := network.Bzz(self.depo, self.backend, self.hive, self.dbAccess, self.config.Swap, self.config.SyncParams) + proto, err := network.Bzz(self.depo, self.backend, self.hive, self.dbAccess, self.config.Swap, self.config.SyncParams, self.config.NetworkId) if err != nil { return nil } @@ -279,7 +279,7 @@ func NewLocalSwarm(datadir, port string) (self *Swarm, err error) { return } - config, err := api.NewConfig(datadir, common.Address{}, prvKey) + config, err := api.NewConfig(datadir, common.Address{}, prvKey, network.NetworkId) if err != nil { return } |