aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-02-13 23:08:30 +0800
committerobscuren <geffobscura@gmail.com>2015-02-13 23:08:30 +0800
commit5c251b69282b3992512d0c17ed0063f294a0e663 (patch)
tree7842c1a6ac8394e8bebfd4f27c9222b497aaf0f6 /core
parent75d164037fb9bbf75def7c5501727fd634ef124f (diff)
parentbde3ff16ad98cb4ab0befc899f7f0584d21ff9a4 (diff)
downloadgo-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.gz
go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.tar.zst
go-tangerine-5c251b69282b3992512d0c17ed0063f294a0e663.zip
Merge branch 'fjl-poc8-net-integration' into develop
Diffstat (limited to 'core')
-rw-r--r--core/helper_test.go8
-rw-r--r--core/manager.go1
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
}