diff options
| author | obscuren <geffobscura@gmail.com> | 2015-05-13 01:05:33 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-05-13 01:05:33 +0800 |
| commit | 8e24378cc1acb074b56de75bf0baf6feb7927677 (patch) | |
| tree | 71f866652de6b45da5ad4403b88f5def9a684e36 /tests | |
| parent | 7d69679935ff8c04aebb60f27074f08c5e84ac95 (diff) | |
| parent | 8fe01b4bfa28ad5a1fdde7f9837e8f982843389a (diff) | |
| download | go-tangerine-8e24378cc1acb074b56de75bf0baf6feb7927677.tar go-tangerine-8e24378cc1acb074b56de75bf0baf6feb7927677.tar.gz go-tangerine-8e24378cc1acb074b56de75bf0baf6feb7927677.tar.bz2 go-tangerine-8e24378cc1acb074b56de75bf0baf6feb7927677.tar.lz go-tangerine-8e24378cc1acb074b56de75bf0baf6feb7927677.tar.xz go-tangerine-8e24378cc1acb074b56de75bf0baf6feb7927677.tar.zst go-tangerine-8e24378cc1acb074b56de75bf0baf6feb7927677.zip | |
Merge branch 'release/0.9.20'v0.9.20
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/block_test.go | 4 | ||||
| -rw-r--r-- | tests/block_test_util.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/block_test.go b/tests/block_test.go index e72f2b548..0ba0aefa2 100644 --- a/tests/block_test.go +++ b/tests/block_test.go @@ -1,7 +1,7 @@ package tests import ( - "path" + "path/filepath" "testing" "github.com/ethereum/go-ethereum/accounts" @@ -99,7 +99,7 @@ func runBlockTest(name string, test *BlockTest, t *testing.T) { } func testEthConfig() *eth.Config { - ks := crypto.NewKeyStorePassphrase(path.Join(common.DefaultDataDir(), "keys")) + ks := crypto.NewKeyStorePassphrase(filepath.Join(common.DefaultDataDir(), "keystore")) return ð.Config{ DataDir: common.DefaultDataDir(), diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 093c9be0c..ae2ae4033 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -113,7 +113,7 @@ func (t *BlockTest) InsertPreState(ethereum *eth.Ethereum) (*state.StateDB, erro if acct.PrivateKey != "" { privkey, err := hex.DecodeString(strings.TrimPrefix(acct.PrivateKey, "0x")) err = crypto.ImportBlockTestKey(privkey) - err = ethereum.AccountManager().TimedUnlock(addr, "", 999999*time.Second) + err = ethereum.AccountManager().TimedUnlock(common.BytesToAddress(addr), "", 999999*time.Second) if err != nil { return nil, err } |