status-im
/
op-geth
mirror of https://github.com/status-im/op-geth.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed mkdnode & added some tests

This commit is contained in:
obscuren 2015-03-19 10:57:02 +01:00
parent e67d32b467
commit d7ab716eea
8 changed files with 55 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/ethtest/main.go
View File

@ -24,7 +24,6 @@ package main
import (
"bytes"
"encoding/json"
"fmt"
"io"
"io/ioutil"
"log"
@ -33,8 +32,8 @@ import (
"strconv"
"strings"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/tests/helper"
@ -136,7 +135,7 @@ func RunVmTest(r io.Reader) (failed int) {
rexp := helper.FromHex(test.Out)
if bytes.Compare(rexp, ret) != 0 {
fmt.Printf("FAIL: %s's return failed. Expected %x, got %x\n", name, rexp, ret)
helper.Log.Infof("FAIL: %s's return failed. Expected %x, got %x\n", name, rexp, ret)
failed = 1
}
@ -148,7 +147,13 @@ func RunVmTest(r io.Reader) (failed int) {
if len(test.Exec) == 0 {
if obj.Balance().Cmp(common.Big(account.Balance)) != 0 {
fmt.Printf("FAIL: %s's : (%x) balance failed. Expected %v, got %v => %v\n", name, obj.Address()[:4], account.Balance, obj.Balance(), new(big.Int).Sub(common.Big(account.Balance), obj.Balance()))
helper.Log.Infof("FAIL: %s's : (%x) balance failed. Expected %v, got %v => %v\n",
name,
obj.Address()[:4],
account.Balance,
obj.Balance(),
new(big.Int).Sub(common.Big(account.Balance), obj.Balance()),
)
failed = 1
}
}
@ -158,20 +163,20 @@ func RunVmTest(r io.Reader) (failed int) {
vexp := helper.FromHex(value)
if bytes.Compare(v, vexp) != 0 {
fmt.Printf("FAIL: %s's : (%x: %s) storage failed. Expected %x, got %x (%v %v)\n", name, obj.Address()[0:4], addr, vexp, v, common.BigD(vexp), common.BigD(v))
helper.Log.Infof("FAIL: %s's : (%x: %s) storage failed. Expected %x, got %x (%v %v)\n", name, obj.Address()[0:4], addr, vexp, v, common.BigD(vexp), common.BigD(v))
failed = 1
}
}
}
if !bytes.Equal(common.Hex2Bytes(test.PostStateRoot), statedb.Root()) {
fmt.Printf("FAIL: %s's : Post state root error. Expected %s, got %x\n", name, test.PostStateRoot, statedb.Root())
helper.Log.Infof("FAIL: %s's : Post state root error. Expected %s, got %x\n", name, test.PostStateRoot, statedb.Root())
failed = 1
}
if len(test.Logs) > 0 {
if len(test.Logs) != len(logs) {
fmt.Printf("FAIL: log length mismatch. Expected %d, got %d", len(test.Logs), len(logs))
helper.Log.Infof("FAIL: log length mismatch. Expected %d, got %d", len(test.Logs), len(logs))
failed = 1
} else {
/*

1
state/dump.go
View File

@ -35,6 +35,7 @@ func (self *StateDB) RawDump() World {
storageIt := stateObject.State.trie.Iterator()
for storageIt.Next() {
fmt.Println("value", storageIt.Value)
account.Storage[common.Bytes2Hex(storageIt.Key)] = common.Bytes2Hex(storageIt.Value)
}
world.Accounts[common.Bytes2Hex(it.Key)] = account

2
state/state_object.go
View File

@ -5,8 +5,8 @@ import (
"fmt"
"math/big"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/trie"
)

20
state/state_test.go
View File

@ -1,12 +1,14 @@
package state
import (
"fmt"
"math/big"
"testing"
checker "gopkg.in/check.v1"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/ethdb"
)
type StateSuite struct {
@ -61,6 +63,22 @@ func (s *StateSuite) SetUpTest(c *checker.C) {
s.state = New(nil, db)
}
func TestNull(t *testing.T) {
db, _ := ethdb.NewMemDatabase()
state := New(nil, db)
address := common.FromHex("0x823140710bf13990e4500136726d8b55")
state.NewStateObject(address)
//value := common.FromHex("0x823140710bf13990e4500136726d8b55")
value := make([]byte, 16)
fmt.Println("test it here", common.NewValue(value))
state.SetState(address, []byte{0}, value)
state.Update(nil)
state.Sync()
value = state.GetState(address, []byte{0})
fmt.Printf("res: %x\n", value)
}
func (s *StateSuite) TestSnapshot(c *checker.C) {
stateobjaddr := []byte("aa")
storageaddr := common.Big("0")

4
state/statedb.go
View File

@ -33,6 +33,10 @@ func New(root []byte, db common.Database) *StateDB {
return &StateDB{db: db, trie: trie, stateObjects: make(map[string]*StateObject), refund: make(map[string]*big.Int)}
}
func (self *StateDB) PrintRoot() {
self.trie.Trie.PrintRoot()
}
func (self *StateDB) EmptyLogs() {
self.logs = nil
}

12
trie/trie.go
View File

@ -6,8 +6,8 @@ import (
"fmt"
"sync"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
)
func ParanoiaCheck(t1 *Trie, backend Backend) (bool, *Trie) {
@ -305,11 +305,13 @@ func (self *Trie) mknode(value *common.Value) Node {
return NewShortNode(self, CompactDecode(string(value.Get(0).Bytes())), self.mknode(value.Get(1)))
}
case 17:
fnode := NewFullNode(self)
for i := 0; i < l; i++ {
fnode.set(byte(i), self.mknode(value.Get(i)))
if len(value.Bytes()) != 17 {
fnode := NewFullNode(self)
for i := 0; i < l; i++ {
fnode.set(byte(i), self.mknode(value.Get(i)))
}
return fnode
}
return fnode
case 32:
return &HashNode{value.Bytes(), self}
}

11
trie/trie_test.go
View File

@ -5,8 +5,8 @@ import (
"fmt"
"testing"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
)
type Db map[string][]byte
@ -32,6 +32,15 @@ func TestEmptyTrie(t *testing.T) {
}
}
func TestNull(t *testing.T) {
trie := NewEmpty()
key := make([]byte, 32)
value := common.FromHex("0x823140710bf13990e4500136726d8b55")
trie.Update(key, value)
value = trie.Get(key)
}
func TestInsert(t *testing.T) {
trie := NewEmpty()

2
vm/vm.go
View File

@ -4,8 +4,8 @@ import (
"fmt"
"math/big"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/state"
)