diff options
author | Felix Lange <fjl@twurst.com> | 2014-11-01 01:56:25 +0800 |
---|---|---|
committer | Felix Lange <fjl@twurst.com> | 2014-11-01 01:56:25 +0800 |
commit | 394e0f60c20206c7f7c4c76551d11a2b14b23a4d (patch) | |
tree | e6765c3630ae19d05d9398139f708e77dd918fe4 | |
parent | b95d9e005da6ed58df947732b4c126dedff5effb (diff) | |
download | dexon-394e0f60c20206c7f7c4c76551d11a2b14b23a4d.tar dexon-394e0f60c20206c7f7c4c76551d11a2b14b23a4d.tar.gz dexon-394e0f60c20206c7f7c4c76551d11a2b14b23a4d.tar.bz2 dexon-394e0f60c20206c7f7c4c76551d11a2b14b23a4d.tar.lz dexon-394e0f60c20206c7f7c4c76551d11a2b14b23a4d.tar.xz dexon-394e0f60c20206c7f7c4c76551d11a2b14b23a4d.tar.zst dexon-394e0f60c20206c7f7c4c76551d11a2b14b23a4d.zip |
chain, tests/helper, vm: make tests compile
They were broken by df5603de0a34e80a1, when vm.Log became ethstate.Log.
-rw-r--r-- | chain/bloom9_test.go | 6 | ||||
-rw-r--r-- | tests/helper/vm.go | 2 | ||||
-rw-r--r-- | vm/vm_test.go | 2 |
3 files changed, 6 insertions, 4 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/tests/helper/vm.go b/tests/helper/vm.go index 4827dfdee..db71fe17e 100644 --- a/tests/helper/vm.go +++ b/tests/helper/vm.go @@ -50,7 +50,7 @@ func (self *Env) Difficulty() *big.Int { return self.difficulty } func (self *Env) BlockHash() []byte { return nil } func (self *Env) State() *state.State { return self.state } func (self *Env) GasLimit() *big.Int { return self.gasLimit } -func (self *Env) AddLog(vm.Log) {} +func (self *Env) AddLog(state.Log) {} func (self *Env) Transfer(from, to vm.Account, amount *big.Int) error { return vm.Transfer(from, to, amount) } diff --git a/vm/vm_test.go b/vm/vm_test.go index 3599b694a..f5d77cbff 100644 --- a/vm/vm_test.go +++ b/vm/vm_test.go @@ -28,7 +28,7 @@ func (TestEnv) Time() int64 { return 0 } func (TestEnv) GasLimit() *big.Int { return nil } func (TestEnv) Difficulty() *big.Int { return nil } func (TestEnv) Value() *big.Int { return nil } -func (TestEnv) AddLog(Log) {} +func (TestEnv) AddLog(state.Log) {} func (TestEnv) Transfer(from, to Account, amount *big.Int) error { return nil |