gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1282 from obscuren/state-cleanup

Browse Source 
core/state: cleanup & optimisations
This commit is contained in:
Jeffrey Wilcke
2015-06-18 05:29:53 -07:00
parent 53a6145a2b 430bcdb219
commit 2cea410656
14 changed files with 176 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/block_test_util.go
View File

@ -124,7 +124,7 @@ func (t *BlockTest) InsertPreState(ethereum *eth.Ethereum) (*state.StateDB, erro
obj.SetBalance(balance)
obj.SetNonce(nonce)
for k, v := range acct.Storage {
statedb.SetState(common.HexToAddress(addrString), common.HexToHash(k), common.FromHex(v))
statedb.SetState(common.HexToAddress(addrString), common.HexToHash(k), common.HexToHash(v))
}
}
// sync objects to trie

10
tests/vm/gh_test.go
View File

@ -97,7 +97,7 @@ func RunVmTest(p string, t *testing.T) {
obj := StateObjectFromAccount(db, addr, account)
statedb.SetStateObject(obj)
for a, v := range account.Storage {
obj.SetState(common.HexToHash(a), common.NewValue(helper.FromHex(v)))
obj.SetState(common.HexToHash(a), common.HexToHash(v))
}
}
@ -168,11 +168,11 @@ func RunVmTest(p string, t *testing.T) {
}
for addr, value := range account.Storage {
v := obj.GetState(common.HexToHash(addr)).Bytes()
vexp := helper.FromHex(value)
v := obj.GetState(common.HexToHash(addr))
vexp := common.HexToHash(value)
if bytes.Compare(v, vexp) != 0 {
t.Errorf("%s's : (%x: %s) storage failed. Expected %x, got %x (%v %v)\n", name, obj.Address().Bytes()[0:4], addr, vexp, v, common.BigD(vexp), common.BigD(v))
if v != vexp {
t.Errorf("%s's : (%x: %s) storage failed. Expected %x, got %x (%v %v)\n", name, obj.Address().Bytes()[0:4], addr, vexp, v, vexp.Big(), v.Big())
}
}
}