aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-18 01:00:03 +0800
committerobscuren <geffobscura@gmail.com>2015-03-18 01:00:03 +0800
commit86661de07746cd4e4ad8d016afee9fa8074aa141 (patch)
treeb22bf25b04536ef1cdfce4e92e717b1cd83ebfd9 /tests
parentc21293cd91f5cd95a823065eb2345c840feec1a0 (diff)
downloaddexon-86661de07746cd4e4ad8d016afee9fa8074aa141.tar
dexon-86661de07746cd4e4ad8d016afee9fa8074aa141.tar.gz
dexon-86661de07746cd4e4ad8d016afee9fa8074aa141.tar.bz2
dexon-86661de07746cd4e4ad8d016afee9fa8074aa141.tar.lz
dexon-86661de07746cd4e4ad8d016afee9fa8074aa141.tar.xz
dexon-86661de07746cd4e4ad8d016afee9fa8074aa141.tar.zst
dexon-86661de07746cd4e4ad8d016afee9fa8074aa141.zip
Fixed tests and bloom
Diffstat (limited to 'tests')
-rw-r--r--tests/vm/gh_test.go26
1 files changed, 18 insertions, 8 deletions
diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go
index bce34bb5d..68600d304 100644
--- a/tests/vm/gh_test.go
+++ b/tests/vm/gh_test.go
@@ -2,7 +2,6 @@ package vm
import (
"bytes"
- "fmt"
"math/big"
"strconv"
"testing"
@@ -82,9 +81,6 @@ func RunVmTest(p string, t *testing.T) {
helper.CreateFileTests(t, p, &tests)
for name, test := range tests {
- if name != "log2_nonEmptyMem" {
- continue
- }
db, _ := ethdb.NewMemDatabase()
statedb := state.New(common.Hash{}, db)
for addr, account := range test.Pre {
@@ -172,12 +168,26 @@ func RunVmTest(p string, t *testing.T) {
if len(test.Logs) != len(logs) {
t.Errorf("log length mismatch. Expected %d, got %d", len(test.Logs), len(logs))
} else {
- fmt.Println("A", test.Logs)
- fmt.Println("B", logs)
for i, log := range test.Logs {
+ if common.HexToAddress(log.AddressF) != logs[i].Address() {
+ t.Errorf("'%s' log address expected %v got %x", name, log.AddressF, logs[i].Address())
+ }
+
+ if !bytes.Equal(logs[i].Data(), helper.FromHex(log.DataF)) {
+ t.Errorf("'%s' log data expected %v got %x", name, log.DataF, logs[i].Data())
+ }
+
+ if len(log.TopicsF) != len(logs[i].Topics()) {
+ t.Errorf("'%s' log topics length expected %d got %d", name, len(log.TopicsF), logs[i].Topics())
+ } else {
+ for j, topic := range log.TopicsF {
+ if common.HexToHash(topic) != logs[i].Topics()[j] {
+ t.Errorf("'%s' log topic[%d] expected %v got %x", name, j, topic, logs[i].Topics()[j])
+ }
+ }
+ }
genBloom := common.LeftPadBytes(types.LogsBloom(state.Logs{logs[i]}).Bytes(), 256)
- fmt.Println("A BLOOM", log.BloomF)
- fmt.Printf("B BLOOM %x\n", genBloom)
+
if !bytes.Equal(genBloom, common.Hex2Bytes(log.BloomF)) {
t.Errorf("'%s' bloom mismatch", name)
}