diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-09 02:45:39 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-09 02:45:39 +0800 |
| commit | a7750c929b926d164195fd4f7a7e2b4642c66173 (patch) | |
| tree | 81c104392bfa148e3c8cfc764eb9e152ff64c408 /cmd | |
| parent | f08e9cbe42dcb067affe0ca1077285ba1b583c95 (diff) | |
| download | dexon-a7750c929b926d164195fd4f7a7e2b4642c66173.tar.gz dexon-a7750c929b926d164195fd4f7a7e2b4642c66173.tar.zst dexon-a7750c929b926d164195fd4f7a7e2b4642c66173.zip | |
Fixed tests to reflect log changes
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ethtest/main.go | 16 | ||||
| -rw-r--r-- | cmd/evm/main.go | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go index 952ba1bd6..3c5b2cedf 100644 --- a/cmd/ethtest/main.go +++ b/cmd/ethtest/main.go @@ -176,23 +176,23 @@ func RunVmTest(r io.Reader) (failed int) { failed = 1 } else { for i, log := range test.Logs { - if common.HexToAddress(log.AddressF) != logs[i].Address() { - helper.Log.Infof("'%s' log address failed. Expected %v got %x", name, log.AddressF, logs[i].Address()) + if common.HexToAddress(log.AddressF) != logs[i].Address { + helper.Log.Infof("'%s' log address failed. Expected %v got %x", name, log.AddressF, logs[i].Address) failed = 1 } - if !bytes.Equal(logs[i].Data(), helper.FromHex(log.DataF)) { - helper.Log.Infof("'%s' log data failed. Expected %v got %x", name, log.DataF, logs[i].Data()) + if !bytes.Equal(logs[i].Data, helper.FromHex(log.DataF)) { + helper.Log.Infof("'%s' log data failed. Expected %v got %x", name, log.DataF, logs[i].Data) failed = 1 } - if len(log.TopicsF) != len(logs[i].Topics()) { - helper.Log.Infof("'%s' log topics length failed. Expected %d got %d", name, len(log.TopicsF), logs[i].Topics()) + if len(log.TopicsF) != len(logs[i].Topics) { + helper.Log.Infof("'%s' log topics length failed. Expected %d got %d", name, len(log.TopicsF), logs[i].Topics) failed = 1 } else { for j, topic := range log.TopicsF { - if common.HexToHash(topic) != logs[i].Topics()[j] { - helper.Log.Infof("'%s' log topic[%d] failed. Expected %v got %x", name, j, topic, logs[i].Topics()[j]) + if common.HexToHash(topic) != logs[i].Topics[j] { + helper.Log.Infof("'%s' log topic[%d] failed. Expected %v got %x", name, j, topic, logs[i].Topics[j]) failed = 1 } } diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 5eb753fa8..561f1a943 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -133,7 +133,7 @@ func (self *VMEnv) GetHash(n uint64) common.Hash { } return common.Hash{} } -func (self *VMEnv) AddLog(log state.Log) { +func (self *VMEnv) AddLog(log *state.Log) { self.state.AddLog(log) } func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error { |