diff options
| -rw-r--r-- | cmd/geth/js.go | 2 | ||||
| -rw-r--r-- | tests/vm/gh_test.go | 26 |
2 files changed, 11 insertions, 17 deletions
diff --git a/cmd/geth/js.go b/cmd/geth/js.go index f99051a1e..342a80bd2 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -141,7 +141,7 @@ var net = web3.net; utils.Fatalf("Error setting namespaces: %v", err) } - js.re.Eval(globalRegistrar + "registrar = new GlobalRegistrar(\"" + globalRegistrarAddr + "\");") + js.re.Eval(globalRegistrar + "registrar = GlobalRegistrar.at(\"" + globalRegistrarAddr + "\");") } var ds, _ = docserver.New("/") diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go index 68eb4cb45..2f76084d0 100644 --- a/tests/vm/gh_test.go +++ b/tests/vm/gh_test.go @@ -2,7 +2,6 @@ package vm import ( "bytes" - "io/ioutil" "math/big" "os" "path/filepath" @@ -373,21 +372,16 @@ func TestWallet(t *testing.T) { RunVmTest(fn, t) } -func TestRandom(t *testing.T) { - // TODO: fix JSON EOF bug and unskip - t.Skip() - fileNames := make([]string, 1024) - fileInfos, err := ioutil.ReadDir("../files/StateTests/RandomTests") - if err != nil { - t.Errorf("Could not read StateTests/RandomTests dir: %v", err) - return - } - for _, fileInfo := range fileInfos { - fileNames = append(fileNames, fileInfo.Name()) +func TestStateTestsRandom(t *testing.T) { + fns, _ := filepath.Glob("../files/StateTests/RandomTests/*") + for _, fn := range fns { + RunVmTest(fn, t) } +} - //for _, f := range fileNames { - path := filepath.Join("../files/StateTests/RandomTests/", fileNames[0]) - RunVmTest(path, t) - //} +func TestVMRandom(t *testing.T) { + fns, _ := filepath.Glob("../files/VMTests/RandomTests/*") + for _, fn := range fns { + RunVmTest(fn, t) + } } |