aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-07-03 19:45:12 +0800
committerJeffrey Wilcke <geffobscura@gmail.com>2015-07-07 16:43:49 +0800
commit492e5049d7cfac3b172655ea25d9a03f91f76047 (patch)
tree0e0d4913ea39ea474a8c4c095cd4afbde931bf89 /cmd/geth
parent042c3290b390bc7941bd20dcbbe69253a9b6be95 (diff)
downloadgo-tangerine-492e5049d7cfac3b172655ea25d9a03f91f76047.tar.gz
go-tangerine-492e5049d7cfac3b172655ea25d9a03f91f76047.tar.zst
go-tangerine-492e5049d7cfac3b172655ea25d9a03f91f76047.zip
rename js methods in js_test for new console API
+ rebase fixes
Diffstat (limited to 'cmd/geth')
-rw-r--r--cmd/geth/js_test.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go
index 91b927dd3..bde5d250f 100644
--- a/cmd/geth/js_test.go
+++ b/cmd/geth/js_test.go
@@ -254,7 +254,7 @@ func TestSignature(t *testing.T) {
}
func TestContract(t *testing.T) {
- t.Skip("contract testing is implemented with mining in ethash test mode. This takes about 7seconds to run. Unskip and run on demand")
+ // t.Skip("contract testing is implemented with mining in ethash test mode. This takes about 7seconds to run. Unskip and run on demand")
tmp, repl, ethereum := testJEthRE(t)
if err := ethereum.Start(); err != nil {
t.Errorf("error starting ethereum: %v", err)
@@ -285,7 +285,7 @@ func TestContract(t *testing.T) {
` }\n` +
`}\n`
- if checkEvalJSON(t, repl, `admin.contractInfo.stop()`, `true`) != nil {
+ if checkEvalJSON(t, repl, `admin.stopNatSpec()`, `true`) != nil {
return
}
@@ -355,7 +355,7 @@ multiply7 = Multiply7.at(contractaddress);
return
}
- if checkEvalJSON(t, repl, `admin.contractInfo.start()`, `true`) != nil {
+ if checkEvalJSON(t, repl, `admin.startNatSpec()`, `true`) != nil {
return
}
if checkEvalJSON(t, repl, `multiply7.multiply.sendTransaction(6, { from: primary })`, `"0xcb08355dff8f8cadb5dc3d72e652ef5c33792cb0d871229dd1aef5db1c4ba1f2"`) != nil {
@@ -381,17 +381,17 @@ multiply7 = Multiply7.at(contractaddress);
if checkEvalJSON(t, repl, `filename = "/tmp/info.json"`, `"/tmp/info.json"`) != nil {
return
}
- if checkEvalJSON(t, repl, `contentHash = admin.contractInfo.saveInfo(contract.info, filename)`, contentHash) != nil {
+ if checkEvalJSON(t, repl, `contentHash = admin.saveInfo(contract.info, filename)`, contentHash) != nil {
return
}
- if checkEvalJSON(t, repl, `admin.contractInfo.register(primary, contractaddress, contentHash)`, `true`) != nil {
+ if checkEvalJSON(t, repl, `admin.register(primary, contractaddress, contentHash)`, `true`) != nil {
return
}
- if checkEvalJSON(t, repl, `admin.contractInfo.registerUrl(primary, contentHash, "file://"+filename)`, `true`) != nil {
+ if checkEvalJSON(t, repl, `admin.registerUrl(primary, contentHash, "file://"+filename)`, `true`) != nil {
return
}
- if checkEvalJSON(t, repl, `admin.contractInfo.start()`, `true`) != nil {
+ if checkEvalJSON(t, repl, `admin.startNatSpec()`, `true`) != nil {
return
}