From f3473312ba90b37b9a4100592a8c4d5d5bf245b7 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 31 Oct 2014 18:40:32 +0100
Subject: all: fix rename breakage

---
 chain/helper_test.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'chain')

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
 }
 
-- 
cgit 


From 394e0f60c20206c7f7c4c76551d11a2b14b23a4d Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Fri, 31 Oct 2014 18:56:25 +0100
Subject: chain, tests/helper, vm: make tests compile

They were broken by df5603de0a34e80a1, when vm.Log became ethstate.Log.
---
 chain/bloom9_test.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'chain')

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 {
-- 
cgit