compilable trie (tests fail)

1 files changed, 15 insertions, 11 deletions

diff --git a/trie/secure_trie.go b/trie/secure_trie.go
index b9fa376b8..b31791cad 100644
--- a/trie/secure_trie.go
+++ b/trie/secure_trie.go
@@ -1,34 +1,38 @@
 package trie
 
-import "github.com/ethereum/go-ethereum/crypto"
+import (
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
+)
 
 type SecureTrie struct {
 	*Trie
 }
 
-func NewSecure(root []byte, backend Backend) *SecureTrie {
+func NewSecure(root common.Hash, backend Backend) *SecureTrie {
 	return &SecureTrie{New(root, backend)}
 }
 
-func (self *SecureTrie) Update(key, value []byte) Node {
-	return self.Trie.Update(crypto.Sha3(key), value)
+func (self *SecureTrie) Update(key common.Hash, value []byte) Node {
+	return self.Trie.Update(common.BytesToHash(crypto.Sha3(key[:])), value)
 }
+
 func (self *SecureTrie) UpdateString(key, value string) Node {
-	return self.Update([]byte(key), []byte(value))
+	return self.Update(common.StringToHash(key), []byte(value))
 }
 
-func (self *SecureTrie) Get(key []byte) []byte {
-	return self.Trie.Get(crypto.Sha3(key))
+func (self *SecureTrie) Get(key common.Hash) []byte {
+	return self.Trie.Get(common.BytesToHash(crypto.Sha3(key[:])))
 }
 func (self *SecureTrie) GetString(key string) []byte {
-	return self.Get([]byte(key))
+	return self.Get(common.StringToHash(key))
 }
 
-func (self *SecureTrie) Delete(key []byte) Node {
-	return self.Trie.Delete(crypto.Sha3(key))
+func (self *SecureTrie) Delete(key common.Hash) Node {
+	return self.Trie.Delete(common.BytesToHash(crypto.Sha3(key[:])))
 }
 func (self *SecureTrie) DeleteString(key string) Node {
-	return self.Delete([]byte(key))
+	return self.Delete(common.StringToHash(key))
 }
 
 func (self *SecureTrie) Copy() *SecureTrie {