Fixed remote Arithmetic tests
This commit is contained in:
@ -4,12 +4,15 @@ import (
|
||||
"encoding/json"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func CreateTests(uri string, value interface{}) error {
|
||||
func CreateTests(t *testing.T, uri string, value interface{}) {
|
||||
resp, err := http.Get(uri)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
t.Error(err)
|
||||
|
||||
return
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
@ -17,8 +20,6 @@ func CreateTests(uri string, value interface{}) error {
|
||||
|
||||
err = json.Unmarshal(data, &value)
|
||||
if err != nil {
|
||||
return err
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
@ -8,8 +8,11 @@ import (
|
||||
"github.com/ethereum/eth-go/ethutil"
|
||||
)
|
||||
|
||||
var Logger ethlog.LogSystem
|
||||
|
||||
func init() {
|
||||
ethlog.AddLogSystem(ethlog.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlog.LogLevel(4)))
|
||||
Logger = ethlog.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlog.LogLevel(4))
|
||||
ethlog.AddLogSystem(Logger)
|
||||
|
||||
ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "")
|
||||
}
|
||||
|
@ -1,7 +1,6 @@
|
||||
package helper
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"math/big"
|
||||
|
||||
"github.com/ethereum/eth-go/ethstate"
|
||||
@ -51,16 +50,13 @@ func (self *Env) BlockHash() []byte { return nil }
|
||||
// This is likely to fail if anything ever gets looked up in the state trie :-)
|
||||
func (self *Env) State() *ethstate.State { return ethstate.New(ethtrie.New(nil, "")) }
|
||||
|
||||
func RunVm(state *ethstate.State, env, exec map[string]string) ([]byte, *big.Int) {
|
||||
func RunVm(state *ethstate.State, env, exec map[string]string) ([]byte, *big.Int, error) {
|
||||
caller := state.NewStateObject(ethutil.Hex2Bytes(exec["caller"]))
|
||||
callee := state.GetStateObject(ethutil.Hex2Bytes(exec["address"]))
|
||||
closure := ethvm.NewClosure(nil, caller, callee, callee.Code, ethutil.Big(exec["gas"]), ethutil.Big(exec["gasPrice"]))
|
||||
|
||||
vm := ethvm.New(NewEnvFromMap(state, env, exec), ethvm.DebugVmTy)
|
||||
ret, _, e := closure.Call(vm, nil)
|
||||
if e != nil {
|
||||
fmt.Println(e)
|
||||
}
|
||||
|
||||
return ret, closure.Gas
|
||||
return ret, closure.Gas, e
|
||||
}
|
||||
|
Reference in New Issue
Block a user