Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

2 files changed, 9 insertions, 7 deletions

diff --git a/chain/bloom9_test.go b/chain/bloom9_test.go
index b5a269504..863d0adee 100644
--- a/chain/bloom9_test.go
+++ b/chain/bloom9_test.go
@@ -3,12 +3,14 @@ package chain
 import (
 	"testing"
 
-	"github.com/ethereum/go-ethereum/vm"
+	"github.com/ethereum/go-ethereum/state"
 )
 
 func TestBloom9(t *testing.T) {
 	testCase := []byte("testtest")
-	bin := LogsBloom([]vm.Log{vm.Log{testCase, [][]byte{[]byte("hellohello")}, nil}}).Bytes()
+	bin := LogsBloom([]state.Log{
+		{testCase, [][]byte{[]byte("hellohello")}, nil},
+	}).Bytes()
 	res := BloomLookup(bin, testCase)
 
 	if !res {
diff --git a/chain/helper_test.go b/chain/helper_test.go
index 59d1c4cca..642d19c95 100644
--- a/chain/helper_test.go
+++ b/chain/helper_test.go
@@ -4,11 +4,11 @@ import (
 	"container/list"
 	"fmt"
 
-	"github.com/ethereum/go-ethereum/ethcrypto"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/ethutil"
-	"github.com/ethereum/go-ethereum/ethwire"
 	"github.com/ethereum/go-ethereum/event"
+	"github.com/ethereum/go-ethereum/wire"
 )
 
 // Implement our EthTest Manager
@@ -53,14 +53,14 @@ func (tm *TestManager) StateManager() *StateManager {
 func (tm *TestManager) EventMux() *event.TypeMux {
 	return tm.eventMux
 }
-func (tm *TestManager) Broadcast(msgType ethwire.MsgType, data []interface{}) {
+func (tm *TestManager) Broadcast(msgType wire.MsgType, data []interface{}) {
 	fmt.Println("Broadcast not implemented")
 }
 
-func (tm *TestManager) ClientIdentity() ethwire.ClientIdentity {
+func (tm *TestManager) ClientIdentity() wire.ClientIdentity {
 	return nil
 }
-func (tm *TestManager) KeyManager() *ethcrypto.KeyManager {
+func (tm *TestManager) KeyManager() *crypto.KeyManager {
 	return nil
 }