diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2016-05-10 04:04:40 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2016-05-10 04:04:40 +0800 |
| commit | 8f96d66241a7585a12a56f28352cb64951abc559 (patch) | |
| tree | d649e6004e1292a59e54f40b163ea7c03ea35c5e /eth/helper_test.go | |
| parent | 4b9de756236b58fab1df2e467fd4f6d85ea9aebb (diff) | |
| parent | 5782164a35ea8acdb09507a604c45941051fd5f3 (diff) | |
| download | go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.gz go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.bz2 go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.lz go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.xz go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.tar.zst go-tangerine-8f96d66241a7585a12a56f28352cb64951abc559.zip | |
Merge branch 'develop' into release/1.4
Diffstat (limited to 'eth/helper_test.go')
| -rw-r--r-- | eth/helper_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/eth/helper_test.go b/eth/helper_test.go index 5703d44cc..dacb1593f 100644 --- a/eth/helper_test.go +++ b/eth/helper_test.go @@ -140,14 +140,14 @@ func newTestPeer(name string, version int, pm *ProtocolManager, shake bool) (*te // Start the peer on a new thread errc := make(chan error, 1) go func() { - pm.newPeerCh <- peer - errc <- pm.handle(peer) + select { + case pm.newPeerCh <- peer: + errc <- pm.handle(peer) + case <-pm.quitSync: + errc <- p2p.DiscQuitting + } }() - tp := &testPeer{ - app: app, - net: net, - peer: peer, - } + tp := &testPeer{app: app, net: net, peer: peer} // Execute any implicitly requested handshakes and return if shake { td, head, genesis := pm.blockchain.Status() |