diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-05 01:47:23 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-05 01:47:23 +0800 |
| commit | 45152dead5c6bc144f8ed51ed85d5ef64f783735 (patch) | |
| tree | 48aa51432821a0d49ffa6d2a015c16f4867a1c63 /cmd/geth/js_test.go | |
| parent | 10fc73376789b1b016fbbd86df3b378df0238a0c (diff) | |
| parent | 912cf7ba049e4bcd5e497c62bb7cb96e7502f1b9 (diff) | |
| download | dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.gz dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.bz2 dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.lz dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.xz dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.tar.zst dexon-45152dead5c6bc144f8ed51ed85d5ef64f783735.zip | |
Merge pull request #1181 from obscuren/txpool_fixes
cmd: transaction pool fixes and improvements
Diffstat (limited to 'cmd/geth/js_test.go')
| -rw-r--r-- | cmd/geth/js_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index dee25e44e..3f34840f3 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) + core.GenesisAccounts = []byte(testGenesis) ks := crypto.NewKeyStorePlain(filepath.Join(tmp, "keystore")) am := accounts.NewManager(ks) @@ -250,7 +250,7 @@ func TestSignature(t *testing.T) { } func TestContract(t *testing.T) { - + t.Skip() tmp, repl, ethereum := testJEthRE(t) if err := ethereum.Start(); err != nil { t.Errorf("error starting ethereum: %v", err) |