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

Moved ethutil => common

Browse Source
This commit is contained in:
obscuren
2015-03-16 11:27:38 +01:00
parent 0b8f66ed9e
commit b523441361
116 changed files with 610 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
trie/trie.go
View File

@ -7,7 +7,7 @@ import (
"sync"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/common"
)
func ParanoiaCheck(t1 *Trie, backend Backend) (bool, *Trie) {
@ -39,7 +39,7 @@ func New(root []byte, backend Backend) *Trie {
}
if root != nil {
value := ethutil.NewValueFromBytes(trie.cache.Get(root))
value := common.NewValueFromBytes(trie.cache.Get(root))
trie.root = trie.mknode(value)
}
@ -71,10 +71,10 @@ func (self *Trie) Hash() []byte {
if byts, ok := t.([]byte); ok && len(byts) > 0 {
hash = byts
} else {
hash = crypto.Sha3(ethutil.Encode(self.root.RlpData()))
hash = crypto.Sha3(common.Encode(self.root.RlpData()))
}
} else {
hash = crypto.Sha3(ethutil.Encode(""))
hash = crypto.Sha3(common.Encode(""))
}
if !bytes.Equal(hash, self.roothash) {
@ -105,7 +105,7 @@ func (self *Trie) Reset() {
revision := self.revisions.Remove(self.revisions.Back()).([]byte)
self.roothash = revision
}
value := ethutil.NewValueFromBytes(self.cache.Get(self.roothash))
value := common.NewValueFromBytes(self.cache.Get(self.roothash))
self.root = self.mknode(value)
}
@ -294,7 +294,7 @@ func (self *Trie) delete(node Node, key []byte) Node {
}
// casting functions and cache storing
func (self *Trie) mknode(value *ethutil.Value) Node {
func (self *Trie) mknode(value *common.Value) Node {
l := value.Len()
switch l {
case 0:
@ -320,7 +320,7 @@ func (self *Trie) mknode(value *ethutil.Value) Node {
func (self *Trie) trans(node Node) Node {
switch node := node.(type) {
case *HashNode:
value := ethutil.NewValueFromBytes(self.cache.Get(node.key))
value := common.NewValueFromBytes(self.cache.Get(node.key))
return self.mknode(value)
default:
return node
@ -328,7 +328,7 @@ func (self *Trie) trans(node Node) Node {
}
func (self *Trie) store(node Node) interface{} {
data := ethutil.Encode(node)
data := common.Encode(node)
if len(data) >= 32 {
key := crypto.Sha3(data)
self.cache.Put(key, data)