From fe9e95a3fd6275fe2740261d3d110c13de4aa0ce Mon Sep 17 00:00:00 2001 From: Gustav Simonsson Date: Sun, 26 Apr 2015 17:18:06 +0200 Subject: Fix natspec e2e test accounts type (again) --- common/natspec/natspec_e2e_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/natspec/natspec_e2e_test.go') diff --git a/common/natspec/natspec_e2e_test.go b/common/natspec/natspec_e2e_test.go index f9b0c1dcc..37b348207 100644 --- a/common/natspec/natspec_e2e_test.go +++ b/common/natspec/natspec_e2e_test.go @@ -84,7 +84,7 @@ type testFrontend struct { } func (self *testFrontend) UnlockAccount(acc []byte) bool { - self.ethereum.AccountManager().Unlock(acc, "password") + self.ethereum.AccountManager().Unlock(common.BytesToAddress(acc), "password") return true } -- cgit v1.2.3 From 8001e48115fdfa9a032d4c3c3d4d772cd08592c5 Mon Sep 17 00:00:00 2001 From: Gustav Simonsson Date: Tue, 12 May 2015 17:04:35 +0200 Subject: Fix natspec test (again x2) types --- common/natspec/natspec_e2e_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'common/natspec/natspec_e2e_test.go') diff --git a/common/natspec/natspec_e2e_test.go b/common/natspec/natspec_e2e_test.go index 37b348207..a7fc5cb77 100644 --- a/common/natspec/natspec_e2e_test.go +++ b/common/natspec/natspec_e2e_test.go @@ -4,6 +4,7 @@ import ( "fmt" "io/ioutil" "os" + "strings" "testing" "github.com/ethereum/go-ethereum/accounts" @@ -115,7 +116,7 @@ func testEth(t *testing.T) (ethereum *eth.Ethereum, err error) { if err != nil { panic(err) } - testAddress := common.Bytes2Hex(testAccount.Address) + testAddress := strings.TrimPrefix(testAccount.Address.Hex(), "0x") // set up mock genesis with balance on the testAddress core.GenesisData = []byte(`{ -- 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 --- common/natspec/natspec_e2e_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'common/natspec/natspec_e2e_test.go') diff --git a/common/natspec/natspec_e2e_test.go b/common/natspec/natspec_e2e_test.go index a7fc5cb77..a8d318b57 100644 --- a/common/natspec/natspec_e2e_test.go +++ b/common/natspec/natspec_e2e_test.go @@ -104,13 +104,13 @@ func testEth(t *testing.T) (ethereum *eth.Ethereum, err error) { os.RemoveAll("/tmp/eth-natspec/") - err = os.MkdirAll("/tmp/eth-natspec/keys", os.ModePerm) + err = os.MkdirAll("/tmp/eth-natspec/keystore", os.ModePerm) if err != nil { panic(err) } // create a testAddress - ks := crypto.NewKeyStorePassphrase("/tmp/eth-natspec/keys") + ks := crypto.NewKeyStorePassphrase("/tmp/eth-natspec/keystore") am := accounts.NewManager(ks) testAccount, err := am.NewAccount("password") if err != nil { -- cgit v1.2.3