diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-06 00:21:32 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-06 00:21:32 +0800 |
| commit | ba0c41436c8a067937aa0845963f9ec3b81e7aed (patch) | |
| tree | 7bd9bbc9422353ab341f01581abeb346b5a6cacf /eth/backend.go | |
| parent | fabaf4f1f01db773f6c0c2e9a9499736b1a40848 (diff) | |
| parent | 215c763d53fc8e06e8c9807875eacaccf3ef45fa (diff) | |
| download | dexon-ba0c41436c8a067937aa0845963f9ec3b81e7aed.tar.gz dexon-ba0c41436c8a067937aa0845963f9ec3b81e7aed.tar.zst dexon-ba0c41436c8a067937aa0845963f9ec3b81e7aed.zip | |
Merge branch 'p2p-handshake-2' of https://github.com/fjl/go-ethereum into fjl-p2p-handshake-2
Diffstat (limited to 'eth/backend.go')
| -rw-r--r-- | eth/backend.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/eth/backend.go b/eth/backend.go index 88708b997..4e021a901 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -107,11 +107,9 @@ func (cfg *Config) nodeKey() (*ecdsa.PrivateKey, error) { type Ethereum struct { // Channel for shutting down the ethereum shutdownChan chan bool - quit chan bool // DB interface - db ethutil.Database - blacklist p2p.Blacklist + db ethutil.Database //*** SERVICES *** // State manager for processing new blocks and managing the over all states @@ -169,10 +167,8 @@ func New(config *Config) (*Ethereum, error) { eth := &Ethereum{ shutdownChan: make(chan bool), - quit: make(chan bool), db: db, keyManager: keyManager, - blacklist: p2p.NewBlacklist(), eventMux: &event.TypeMux{}, logger: ethlogger, } @@ -205,7 +201,6 @@ func New(config *Config) (*Ethereum, error) { Name: config.Name, MaxPeers: config.MaxPeers, Protocols: protocols, - Blacklist: eth.blacklist, NAT: config.NAT, NoDial: !config.Dial, BootstrapNodes: config.parseBootNodes(), @@ -279,8 +274,6 @@ func (s *Ethereum) Stop() { // Close the database defer s.db.Close() - close(s.quit) - s.txSub.Unsubscribe() // quits txBroadcastLoop s.blockSub.Unsubscribe() // quits blockBroadcastLoop |