mirror of https://github.com/poanetwork/quorum.git
Changed iterator
This commit is contained in:
parent
9f00aeae29
commit
93261b98c2
|
@ -1,7 +1,6 @@
|
|||
package ethchain
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/ethereum/eth-go/ethcrypto"
|
||||
"github.com/ethereum/eth-go/ethtrie"
|
||||
"github.com/ethereum/eth-go/ethutil"
|
||||
|
@ -27,12 +26,6 @@ func NewState(trie *ethtrie.Trie) *State {
|
|||
return &State{trie: trie, stateObjects: make(map[string]*StateObject), manifest: NewManifest()}
|
||||
}
|
||||
|
||||
// Iterate over each storage address and yield callback
|
||||
func (s *State) EachStorage(cb ethtrie.EachCallback) {
|
||||
it := s.trie.NewIterator()
|
||||
it.Each(cb)
|
||||
}
|
||||
|
||||
// Retrieve the balance from the given address or 0 if object not found
|
||||
func (self *State) GetBalance(addr []byte) *big.Int {
|
||||
stateObject := self.GetStateObject(addr)
|
||||
|
@ -214,11 +207,8 @@ func (self *State) Update() {
|
|||
|
||||
// Debug stuff
|
||||
func (self *State) CreateOutputForDiff() {
|
||||
for addr, stateObject := range self.stateObjects {
|
||||
fmt.Printf("%x %x %x %x\n", addr, stateObject.state.Root(), stateObject.Amount.Bytes(), stateObject.Nonce)
|
||||
stateObject.state.EachStorage(func(addr string, value *ethutil.Value) {
|
||||
fmt.Printf("%x %x\n", addr, value.Bytes())
|
||||
})
|
||||
for _, stateObject := range self.stateObjects {
|
||||
stateObject.CreateOutputForDiff()
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -151,6 +151,24 @@ func (self *StateObject) setStorage(k []byte, value *ethutil.Value) {
|
|||
*/
|
||||
}
|
||||
|
||||
// Iterate over each storage address and yield callback
|
||||
func (self *StateObject) EachStorage(cb ethtrie.EachCallback) {
|
||||
// First loop over the uncommit/cached values in storage
|
||||
for key, value := range self.storage {
|
||||
// XXX Most iterators Fns as it stands require encoded values
|
||||
encoded := ethutil.NewValue(value.Encode())
|
||||
cb(key, encoded)
|
||||
}
|
||||
|
||||
it := self.state.trie.NewIterator()
|
||||
it.Each(func(key string, value *ethutil.Value) {
|
||||
// If it's cached don't call the callback.
|
||||
if self.storage[key] == nil {
|
||||
cb(key, value)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func (self *StateObject) Sync() {
|
||||
/*
|
||||
fmt.Println("############# BEFORE ################")
|
||||
|
@ -303,6 +321,14 @@ func (c *StateObject) Init() Code {
|
|||
return c.initScript
|
||||
}
|
||||
|
||||
// Debug stuff
|
||||
func (self *StateObject) CreateOutputForDiff() {
|
||||
fmt.Printf("%x %x %x %x\n", self.Address(), self.state.Root(), self.Amount.Bytes(), self.Nonce)
|
||||
self.EachStorage(func(addr string, value *ethutil.Value) {
|
||||
fmt.Printf("%x %x\n", addr, value.Bytes())
|
||||
})
|
||||
}
|
||||
|
||||
//
|
||||
// Encoding
|
||||
//
|
||||
|
|
|
@ -158,7 +158,7 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
|
|||
switch op {
|
||||
case STOP, RETURN, SUICIDE:
|
||||
closure.object.Sync()
|
||||
closure.object.state.EachStorage(func(key string, value *ethutil.Value) {
|
||||
closure.object.EachStorage(func(key string, value *ethutil.Value) {
|
||||
value.Decode()
|
||||
fmt.Printf("%x %x\n", new(big.Int).SetBytes([]byte(key)).Bytes(), value.Bytes())
|
||||
})
|
||||
|
|
|
@ -215,7 +215,7 @@ func (c *PStateObject) IsContract() bool {
|
|||
}
|
||||
|
||||
func (self *PStateObject) EachStorage(cb ethtrie.EachCallback) {
|
||||
self.object.State().EachStorage(cb)
|
||||
self.object.EachStorage(cb)
|
||||
}
|
||||
|
||||
type KeyVal struct {
|
||||
|
@ -226,7 +226,7 @@ type KeyVal struct {
|
|||
func (c *PStateObject) StateKeyVal(asJson bool) interface{} {
|
||||
var values []KeyVal
|
||||
if c.object != nil {
|
||||
c.object.State().EachStorage(func(name string, value *ethutil.Value) {
|
||||
c.object.EachStorage(func(name string, value *ethutil.Value) {
|
||||
values = append(values, KeyVal{name, ethutil.Bytes2Hex(value.Bytes())})
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue