diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-07-10 20:29:40 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-07-10 23:37:41 +0800 |
| commit | a32c51effda8682b292d04863aae7811f78abf7e (patch) | |
| tree | d721822cc10c929d5a2def0865c366e085ef99be /cmd/geth | |
| parent | 5a810758dbe75dce9537d464ac0e5b5385b0e78f (diff) | |
| download | go-tangerine-a32c51effda8682b292d04863aae7811f78abf7e.tar.gz go-tangerine-a32c51effda8682b292d04863aae7811f78abf7e.tar.zst go-tangerine-a32c51effda8682b292d04863aae7811f78abf7e.zip | |
cmd, core, eth, common: genesis preparation
Implemented the --genesis flag thru which we can set a custom genesis
block, including the official Ethereum genesis block.
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/js_test.go | 6 | ||||
| -rw-r--r-- | cmd/geth/main.go | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index db2c5ca03..ffd164d27 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -37,6 +37,7 @@ import ( "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/eth" + "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/rpc/codec" "github.com/ethereum/go-ethereum/rpc/comms" ) @@ -89,9 +90,9 @@ func testREPL(t *testing.T, config func(*eth.Config)) (string, *testjethre, *eth t.Fatal(err) } - // set up mock genesis with balance on the testAddress - core.GenesisAccounts = []byte(testGenesis) + db, _ := ethdb.NewMemDatabase() + core.WriteGenesisBlockForTesting(db, common.HexToAddress(testAddress), common.String2Big(testBalance)) ks := crypto.NewKeyStorePlain(filepath.Join(tmp, "keystore")) am := accounts.NewManager(ks) conf := ð.Config{ @@ -102,6 +103,7 @@ func testREPL(t *testing.T, config func(*eth.Config)) (string, *testjethre, *eth Name: "test", SolcPath: testSolcPath, PowTest: true, + NewDB: func(path string) (common.Database, error) { return db, nil }, } if config != nil { config(conf) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 51a0defaa..6acdff9ad 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -277,6 +277,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.UnlockedAccountFlag, utils.PasswordFileFlag, utils.GenesisNonceFlag, + utils.GenesisFileFlag, utils.BootnodesFlag, utils.DataDirFlag, utils.BlockchainVersionFlag, |