From e949a2ed2f1c59ed5ff1f187ad987c882656e6ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Tr=C3=B3n?= Date: Mon, 28 Nov 2016 13:29:33 +0100 Subject: 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 --- swarm/api/config_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'swarm/api/config_test.go') diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go index 8fe3ddacc..39ac2d067 100644 --- a/swarm/api/config_test.go +++ b/swarm/api/config_test.go @@ -83,7 +83,8 @@ var ( "Port": "8500", "PublicKey": "0x045f5cfd26692e48d0017d380349bcf50982488bc11b5145f3ddf88b24924299048450542d43527fbe29a5cb32f38d62755393ac002e6bfdd71b8d7ba725ecd7a3", "BzzKey": "0xe861964402c0b78e2d44098329b8545726f215afa737d803714a4338552fcb81", - "EnsRoot": "0xd344889e0be3e9ef6c26b0f60ef66a32e83c1b69" + "EnsRoot": "0xd344889e0be3e9ef6c26b0f60ef66a32e83c1b69", + "NetworkId": 323 }` ) @@ -95,7 +96,7 @@ func TestConfigWriteRead(t *testing.T) { defer os.RemoveAll(tmp) prvkey := crypto.ToECDSA(common.Hex2Bytes(hexprvkey)) - orig, err := NewConfig(tmp, common.Address{}, prvkey) + orig, err := NewConfig(tmp, common.Address{}, prvkey, 323) if err != nil { t.Fatalf("expected no error, got %v", err) } @@ -109,7 +110,7 @@ func TestConfigWriteRead(t *testing.T) { t.Fatalf("default config mismatch:\nexpected: %v\ngot: %v", exp, string(data)) } - conf, err := NewConfig(tmp, common.Address{}, prvkey) + conf, err := NewConfig(tmp, common.Address{}, prvkey, 323) if err != nil { t.Fatalf("expected no error, got %v", err) } -- cgit v1.2.3