aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-09-22 02:45:59 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-09-22 02:45:59 +0800
commit7bf8e949e7e4da47d8fd094ee692ec6b30b6a046 (patch)
treea94fa5918507ae17f78f650e2f4caaa88a9ba08c /cmd/geth
parentbe76a68aeacccce8ad63270a98beb34db37f0d88 (diff)
parenteaa4473dbd4ad404b85f8f0f63b0418a782351b4 (diff)
downloadgo-tangerine-7bf8e949e7e4da47d8fd094ee692ec6b30b6a046.tar
go-tangerine-7bf8e949e7e4da47d8fd094ee692ec6b30b6a046.tar.gz
go-tangerine-7bf8e949e7e4da47d8fd094ee692ec6b30b6a046.tar.bz2
go-tangerine-7bf8e949e7e4da47d8fd094ee692ec6b30b6a046.tar.lz
go-tangerine-7bf8e949e7e4da47d8fd094ee692ec6b30b6a046.tar.xz
go-tangerine-7bf8e949e7e4da47d8fd094ee692ec6b30b6a046.tar.zst
go-tangerine-7bf8e949e7e4da47d8fd094ee692ec6b30b6a046.zip
Merge pull request #1669 from obscuren/tx-pool-auto-resend
core, xeth: chain reorg move missing transactions to transaction pool
Diffstat (limited to 'cmd/geth')
-rw-r--r--cmd/geth/js_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go
index 2fd5a531d..1f5b28e3a 100644
--- a/cmd/geth/js_test.go
+++ b/cmd/geth/js_test.go
@@ -92,7 +92,7 @@ func testREPL(t *testing.T, config func(*eth.Config)) (string, *testjethre, *eth
db, _ := ethdb.NewMemDatabase()
- core.WriteGenesisBlockForTesting(db, common.HexToAddress(testAddress), common.String2Big(testBalance))
+ core.WriteGenesisBlockForTesting(db, core.GenesisAccount{common.HexToAddress(testAddress), common.String2Big(testBalance)})
ks := crypto.NewKeyStorePlain(filepath.Join(tmp, "keystore"))
am := accounts.NewManager(ks)
conf := &eth.Config{