aboutsummaryrefslogtreecommitdiffstats
path: root/ethchain
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-30 22:58:31 +0800
committerobscuren <geffobscura@gmail.com>2014-05-30 22:58:31 +0800
commit6b7dfa1fb5279407177fb9fb6574ad9760a4e307 (patch)
tree7c8aca5aaf4355256bf245543842065073e56771 /ethchain
parent2ef3a989298aa8dca7872be07ad0abbc32728cc7 (diff)
parent17c825f53a2676ffe17fd7731f8f550aebcb56b0 (diff)
downloaddexon-6b7dfa1fb5279407177fb9fb6574ad9760a4e307.tar
dexon-6b7dfa1fb5279407177fb9fb6574ad9760a4e307.tar.gz
dexon-6b7dfa1fb5279407177fb9fb6574ad9760a4e307.tar.bz2
dexon-6b7dfa1fb5279407177fb9fb6574ad9760a4e307.tar.lz
dexon-6b7dfa1fb5279407177fb9fb6574ad9760a4e307.tar.xz
dexon-6b7dfa1fb5279407177fb9fb6574ad9760a4e307.tar.zst
dexon-6b7dfa1fb5279407177fb9fb6574ad9760a4e307.zip
Merge branch 'develop'
Diffstat (limited to 'ethchain')
-rw-r--r--ethchain/state_test.go1
-rw-r--r--ethchain/vm_test.go2
2 files changed, 1 insertions, 2 deletions
diff --git a/ethchain/state_test.go b/ethchain/state_test.go
index 4cc3fdf75..292129953 100644
--- a/ethchain/state_test.go
+++ b/ethchain/state_test.go
@@ -1,7 +1,6 @@
package ethchain
import (
- "fmt"
"github.com/ethereum/eth-go/ethdb"
"github.com/ethereum/eth-go/ethutil"
"testing"
diff --git a/ethchain/vm_test.go b/ethchain/vm_test.go
index 520f9a2ed..518a88766 100644
--- a/ethchain/vm_test.go
+++ b/ethchain/vm_test.go
@@ -62,7 +62,7 @@ func TestRun4(t *testing.T) {
Diff: big.NewInt(256),
})
var ret []byte
- ret, e = callerClosure.Call(vm, nil, nil)
+ ret, _, e = callerClosure.Call(vm, nil, nil)
if e != nil {
fmt.Println("error", e)
}