diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-21 21:36:20 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-21 21:36:20 +0800 |
| commit | 06697775d1edc3263a7915cee02a94bea488494c (patch) | |
| tree | 1d39f205327ee47115a7fe2947ccd5a4ba7a4073 /eth/backend.go | |
| parent | abce6804a085087770be587e039fd4669d5eac26 (diff) | |
| parent | 069c87b960c48864dc4f1b9086adf582e1dc88a9 (diff) | |
| download | dexon-06697775d1edc3263a7915cee02a94bea488494c.tar dexon-06697775d1edc3263a7915cee02a94bea488494c.tar.gz dexon-06697775d1edc3263a7915cee02a94bea488494c.tar.bz2 dexon-06697775d1edc3263a7915cee02a94bea488494c.tar.lz dexon-06697775d1edc3263a7915cee02a94bea488494c.tar.xz dexon-06697775d1edc3263a7915cee02a94bea488494c.tar.zst dexon-06697775d1edc3263a7915cee02a94bea488494c.zip | |
Merge branch 'conversion' of github.com-obscure:ethereum/go-ethereum into conversion
Diffstat (limited to 'eth/backend.go')
| -rw-r--r-- | eth/backend.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eth/backend.go b/eth/backend.go index b086d6a56..141c6c605 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -206,7 +206,7 @@ func New(config *Config) (*Ethereum, error) { ethProto := EthProtocol(config.ProtocolVersion, config.NetworkId, eth.txPool, eth.chainManager, eth.blockPool) protocols := []p2p.Protocol{ethProto} if config.Shh { - //protocols = append(protocols, eth.whisper.Protocol()) + protocols = append(protocols, eth.whisper.Protocol()) } eth.net = &p2p.Server{ |