From 1fe70a66ba2ef0f148affa7a72b4e65023474859 Mon Sep 17 00:00:00 2001 From: "Daniel A. Nagy" Date: Fri, 8 May 2015 19:37:35 +0200 Subject: Signature test. --- cmd/geth/js_test.go | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'cmd/geth/js_test.go') diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 5587fe2b2..0c54f21dd 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -29,6 +29,8 @@ const ( testKey = "e6fab74a43941f82d89cb7faa408e227cdad3153c4720e540e855c19b15e6674" testAddress = "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" testBalance = "10000000000000000000" + // of empty string + testHash = "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" ) var ( @@ -215,6 +217,32 @@ func TestCheckTestAccountBalance(t *testing.T) { checkEvalJSON(t, repl, `eth.getBalance(primary)`, `"`+testBalance+`"`) } +func TestSignature(t *testing.T) { + tmp, repl, ethereum := testJEthRE(t) + if err := ethereum.Start(); err != nil { + t.Errorf("error starting ethereum: %v", err) + return + } + defer ethereum.Stop() + defer os.RemoveAll(tmp) + + val, err := repl.re.Run(`eth.sign({from: "` + testAddress + `", data: "` + testHash + `"})`) + + // This is a very preliminary test, lacking actual signature verification + if err != nil { + t.Errorf("Error runnig js: %v", err) + return + } + output := val.String() + t.Logf("Output: %v", output) + + regex := regexp.MustCompile(`^0x[0-9a-f]{130}$`) + if !regex.MatchString(output) { + t.Errorf("Signature is not 65 bytes represented in hexadecimal.") + return + } +} + func TestContract(t *testing.T) { tmp, repl, ethereum := testJEthRE(t) -- cgit v1.2.3 From 03bf902b9280aea91eea087f23a4c7aa1f8638c1 Mon Sep 17 00:00:00 2001 From: zelig Date: Sun, 10 May 2015 13:46:38 +0200 Subject: compiler, cli/js: fix solidity compiler tests failing when a different version of solc installed --- cmd/geth/js_test.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'cmd/geth/js_test.go') diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 0c54f21dd..52a1ad03c 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -25,6 +25,7 @@ import ( const ( testSolcPath = "" + solcVersion = "0.9.17" testKey = "e6fab74a43941f82d89cb7faa408e227cdad3153c4720e540e855c19b15e6674" testAddress = "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182" @@ -273,9 +274,16 @@ func TestContract(t *testing.T) { checkEvalJSON(t, repl, `primary = eth.accounts[0]`, `"`+testAddress+`"`) checkEvalJSON(t, repl, `source = "`+source+`"`, `"`+source+`"`) - _, err = compiler.New("") + // if solc is found with right version, test it, otherwise read from file + sol, err := compiler.New("") if err != nil { t.Logf("solc not found: skipping compiler test") + } else if sol.Version() != solcVersion { + err = fmt.Errorf("solc wrong version found (%v, expect %v): skipping compiler test", sol.Version(), solcVersion) + t.Log(err) + } + + if err != nil { info, err := ioutil.ReadFile("info_test.json") if err != nil { t.Fatalf("%v", err) @@ -287,6 +295,7 @@ func TestContract(t *testing.T) { } else { checkEvalJSON(t, repl, `contract = eth.compile.solidity(source)`, string(contractInfo)) } + checkEvalJSON(t, repl, `contract.code`, `"605280600c6000396000f3006000357c010000000000000000000000000000000000000000000000000000000090048063c6888fa114602e57005b60376004356041565b8060005260206000f35b6000600782029050604d565b91905056"`) checkEvalJSON( @@ -326,7 +335,7 @@ multiply7 = new Multiply7(contractaddress); } checkEvalJSON(t, repl, `filename = "/tmp/info.json"`, `"/tmp/info.json"`) - checkEvalJSON(t, repl, `contenthash = admin.contractInfo.register(primary, contractaddress, contract, filename)`, `"0x57e577316ccee6514797d9de9823af2004fdfe22bcfb6e39bbb8f92f57dcc421"`) + checkEvalJSON(t, repl, `contenthash = admin.contractInfo.register(primary, contractaddress, contract, filename)`, `"0x0d067e2dd99a4d8f0c0279738b17130dd415a89f24a23f0e7cf68c546ae3089d"`) checkEvalJSON(t, repl, `admin.contractInfo.registerUrl(primary, contenthash, "file://"+filename)`, `true`) if err != nil { t.Errorf("unexpected error registering, got %v", err) -- cgit v1.2.3 From b79dd188d916da7adbf448dc27b0c59a04e0938d Mon Sep 17 00:00:00 2001 From: Bas van Kervel Date: Tue, 12 May 2015 14:24:11 +0200 Subject: replaced several path.* with filepath.* which is platform independent --- cmd/geth/js_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'cmd/geth/js_test.go') diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 52a1ad03c..3f69876f4 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -4,7 +4,6 @@ import ( "fmt" "io/ioutil" "os" - "path" "path/filepath" "regexp" "runtime" @@ -96,7 +95,7 @@ func testJEthRE(t *testing.T) (string, *testjethre, *eth.Ethereum) { t.Fatal(err) } - assetPath := path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist", "assets", "ext") + assetPath := filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist", "assets", "ext") ds, err := docserver.New("/") if err != nil { t.Errorf("Error creating DocServer: %v", err) @@ -361,7 +360,7 @@ func checkEvalJSON(t *testing.T, re *testjethre, expr, want string) error { } if err != nil { _, file, line, _ := runtime.Caller(1) - file = path.Base(file) + file = filepath.Base(file) fmt.Printf("\t%s:%d: %v\n", file, line, err) t.Fail() } -- cgit v1.2.3 From dca290d5252f23435f48f6b15c332422b2c39b72 Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 12 May 2015 16:02:25 +0200 Subject: sol: skipped source checking step --- cmd/geth/js_test.go | 1 + 1 file changed, 1 insertion(+) (limited to 'cmd/geth/js_test.go') diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 52a1ad03c..d4bf81d54 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -245,6 +245,7 @@ func TestSignature(t *testing.T) { } func TestContract(t *testing.T) { + t.Skip() tmp, repl, ethereum := testJEthRE(t) if err := ethereum.Start(); err != nil { -- cgit v1.2.3 From 231fe04f0309e588c6151e1d5a14fd5adc116bf2 Mon Sep 17 00:00:00 2001 From: Gustav Simonsson Date: Tue, 12 May 2015 17:48:21 +0200 Subject: Fix address type in js test --- cmd/geth/js_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/geth/js_test.go') diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 9b6d503ab..8f9859771 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -45,7 +45,7 @@ type testjethre struct { } func (self *testjethre) UnlockAccount(acc []byte) bool { - err := self.ethereum.AccountManager().Unlock(acc, "") + err := self.ethereum.AccountManager().Unlock(common.BytesToAddress(acc), "") if err != nil { panic("unable to unlock") } -- cgit v1.2.3 From e389585f1f2e77fd7cd507499015bf3754581e4e Mon Sep 17 00:00:00 2001 From: Gustav Simonsson Date: Tue, 12 May 2015 18:33:04 +0200 Subject: Change default keystore dir --- cmd/geth/js_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd/geth/js_test.go') diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 8f9859771..c2a0e2fe2 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -68,7 +68,7 @@ func testJEthRE(t *testing.T) (string, *testjethre, *eth.Ethereum) { // set up mock genesis with balance on the testAddress core.GenesisData = []byte(testGenesis) - ks := crypto.NewKeyStorePassphrase(filepath.Join(tmp, "keys")) + ks := crypto.NewKeyStorePassphrase(filepath.Join(tmp, "keystore")) am := accounts.NewManager(ks) ethereum, err := eth.New(ð.Config{ DataDir: tmp, -- cgit v1.2.3