aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-07-05 05:12:14 +0800
committerJeffrey Wilcke <geffobscura@gmail.com>2015-07-07 16:43:49 +0800
commitaa22cf323ef408f0562817352f68197f8b982f75 (patch)
tree59377ef29bed1157494dd2d9abf22a7f5c029506 /cmd
parent492e5049d7cfac3b172655ea25d9a03f91f76047 (diff)
downloaddexon-aa22cf323ef408f0562817352f68197f8b982f75.tar
dexon-aa22cf323ef408f0562817352f68197f8b982f75.tar.gz
dexon-aa22cf323ef408f0562817352f68197f8b982f75.tar.bz2
dexon-aa22cf323ef408f0562817352f68197f8b982f75.tar.lz
dexon-aa22cf323ef408f0562817352f68197f8b982f75.tar.xz
dexon-aa22cf323ef408f0562817352f68197f8b982f75.tar.zst
dexon-aa22cf323ef408f0562817352f68197f8b982f75.zip
fix js arguments and TestContract passes
Diffstat (limited to 'cmd')
-rw-r--r--cmd/geth/js_test.go17
1 files changed, 10 insertions, 7 deletions
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go
index bde5d250f..791218997 100644
--- a/cmd/geth/js_test.go
+++ b/cmd/geth/js_test.go
@@ -255,7 +255,11 @@ 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")
- tmp, repl, ethereum := testJEthRE(t)
+ coinbase := common.HexToAddress(testAddress)
+ tmp, repl, ethereum := testREPL(t, func(conf *eth.Config) {
+ conf.Etherbase = testAddress
+ conf.PowTest = true
+ })
if err := ethereum.Start(); err != nil {
t.Errorf("error starting ethereum: %v", err)
return
@@ -263,7 +267,6 @@ func TestContract(t *testing.T) {
defer ethereum.Stop()
defer os.RemoveAll(tmp)
- coinbase := common.HexToAddress(testAddress)
reg := registrar.New(repl.xeth)
err := reg.SetGlobalRegistrar("", coinbase)
if err != nil {
@@ -330,12 +333,12 @@ func TestContract(t *testing.T) {
if checkEvalJSON(
t, repl,
`contractaddress = eth.sendTransaction({from: primary, data: contract.code})`,
- `"0x291293d57e0a0ab47effe97c02577f90d9211567"`,
+ `"0x46d69d55c3c4b86a924a92c9fc4720bb7bce1d74"`,
) != nil {
return
}
- if !processTxs(repl, t, 7) {
+ if !processTxs(repl, t, 8) {
return
}
@@ -358,7 +361,7 @@ multiply7 = Multiply7.at(contractaddress);
if checkEvalJSON(t, repl, `admin.startNatSpec()`, `true`) != nil {
return
}
- if checkEvalJSON(t, repl, `multiply7.multiply.sendTransaction(6, { from: primary })`, `"0xcb08355dff8f8cadb5dc3d72e652ef5c33792cb0d871229dd1aef5db1c4ba1f2"`) != nil {
+ if checkEvalJSON(t, repl, `multiply7.multiply.sendTransaction(6, { from: primary })`, `"0x4ef9088431a8033e4580d00e4eb2487275e031ff4163c7529df0ef45af17857b"`) != nil {
return
}
@@ -366,7 +369,7 @@ multiply7 = Multiply7.at(contractaddress);
return
}
- expNotice = `About to submit transaction (no NatSpec info found for contract: content hash not found for '0x87e2802265838c7f14bb69eecd2112911af6767907a702eeaa445239fb20711b'): {"params":[{"to":"0x291293d57e0a0ab47effe97c02577f90d9211567","data": "0xc6888fa10000000000000000000000000000000000000000000000000000000000000006"}]}`
+ expNotice = `About to submit transaction (no NatSpec info found for contract: content hash not found for '0x87e2802265838c7f14bb69eecd2112911af6767907a702eeaa445239fb20711b'): {"params":[{"to":"0x46d69d55c3c4b86a924a92c9fc4720bb7bce1d74","data": "0xc6888fa10000000000000000000000000000000000000000000000000000000000000006"}]}`
if repl.lastConfirm != expNotice {
t.Errorf("incorrect confirmation message: expected\n%v, got\n%v", expNotice, repl.lastConfirm)
return
@@ -399,7 +402,7 @@ multiply7 = Multiply7.at(contractaddress);
return
}
- if checkEvalJSON(t, repl, `multiply7.multiply.sendTransaction(6, { from: primary })`, `"0xe773bf05b027e4485c8b28967c35c939a71c5f6c177db78b51db52e76760d903"`) != nil {
+ if checkEvalJSON(t, repl, `multiply7.multiply.sendTransaction(6, { from: primary })`, `"0x66d7635c12ad0b231e66da2f987ca3dfdca58ffe49c6442aa55960858103fd0c"`) != nil {
return
}