diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-14 00:00:15 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-14 00:00:15 +0800 |
| commit | 8305d409d2ca83583d9fa7e837ec0a46ce6ba78e (patch) | |
| tree | 956c768957f56044113772a88a9cbe7de0ef9cf1 /core | |
| parent | b64ad7a2a6544564b68f362f18c70476310396d6 (diff) | |
| parent | 5c251b69282b3992512d0c17ed0063f294a0e663 (diff) | |
| download | go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.gz go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.bz2 go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.lz go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.xz go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.tar.zst go-tangerine-8305d409d2ca83583d9fa7e837ec0a46ce6ba78e.zip | |
Merge branch 'develop' into miner
Diffstat (limited to 'core')
| -rw-r--r-- | core/helper_test.go | 8 | ||||
| -rw-r--r-- | core/manager.go | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/core/helper_test.go b/core/helper_test.go index 7b41b86f1..473576e3f 100644 --- a/core/helper_test.go +++ b/core/helper_test.go @@ -9,7 +9,6 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" ) // Implement our EthTest Manager @@ -54,13 +53,6 @@ func (tm *TestManager) TxPool() *TxPool { func (tm *TestManager) EventMux() *event.TypeMux { return tm.eventMux } -func (tm *TestManager) Broadcast(msgType p2p.Msg, data []interface{}) { - fmt.Println("Broadcast not implemented") -} - -func (tm *TestManager) ClientIdentity() p2p.ClientIdentity { - return nil -} func (tm *TestManager) KeyManager() *crypto.KeyManager { return nil } diff --git a/core/manager.go b/core/manager.go index 4671573b1..f960fc5f0 100644 --- a/core/manager.go +++ b/core/manager.go @@ -16,7 +16,6 @@ type EthManager interface { IsListening() bool Peers() []*p2p.Peer KeyManager() *crypto.KeyManager - ClientIdentity() p2p.ClientIdentity Db() ethutil.Database EventMux() *event.TypeMux } |