aboutsummaryrefslogtreecommitdiffstats
path: root/ethutil
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2014-06-26 23:37:56 +0800
committerzelig <viktor.tron@gmail.com>2014-06-26 23:37:56 +0800
commitda38faa8f7c0f2a6620b54e46fc38a201845e104 (patch)
tree2656f980c91f9f93d98215867f75c9253e330019 /ethutil
parent098136b68198083a47408ec5c04cd0c8f9fdcc87 (diff)
parent0ed19d9f2024744ba93d0e34db6939766b3cfed5 (diff)
downloaddexon-da38faa8f7c0f2a6620b54e46fc38a201845e104.tar
dexon-da38faa8f7c0f2a6620b54e46fc38a201845e104.tar.gz
dexon-da38faa8f7c0f2a6620b54e46fc38a201845e104.tar.bz2
dexon-da38faa8f7c0f2a6620b54e46fc38a201845e104.tar.lz
dexon-da38faa8f7c0f2a6620b54e46fc38a201845e104.tar.xz
dexon-da38faa8f7c0f2a6620b54e46fc38a201845e104.tar.zst
dexon-da38faa8f7c0f2a6620b54e46fc38a201845e104.zip
merge upstream; fix port in use warning; new logger API
Diffstat (limited to 'ethutil')
-rw-r--r--ethutil/script.go1
-rw-r--r--ethutil/trie.go2
2 files changed, 1 insertions, 2 deletions
diff --git a/ethutil/script.go b/ethutil/script.go
index 235498df2..af4ca6a38 100644
--- a/ethutil/script.go
+++ b/ethutil/script.go
@@ -22,7 +22,6 @@ func Compile(script string) (ret []byte, err error) {
} else {
compiler := mutan.NewCompiler(backend.NewEthereumBackend())
byteCode, errors := compiler.Compile(strings.NewReader(script))
- //byteCode, errors := mutan.Compile(strings.NewReader(script), false)
if len(errors) > 0 {
var errs string
for _, er := range errors {
diff --git a/ethutil/trie.go b/ethutil/trie.go
index 18d0a5f0a..0c1a6d260 100644
--- a/ethutil/trie.go
+++ b/ethutil/trie.go
@@ -47,7 +47,7 @@ func (cache *Cache) Put(v interface{}) interface{} {
value := NewValue(v)
enc := value.Encode()
- if len(enc) >= 32 {
+ if len(enc) < 32 {
sha := Sha3Bin(enc)
cache.nodes[string(sha)] = NewNode(sha, value, true)