diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-05 22:14:01 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-10-05 22:14:01 +0800 |
| commit | 5b34fa538e54320778314081df97da561f7c6314 (patch) | |
| tree | dca15c858b8ac4cd79ed7b7733260ab3021bbd0c /cmd/geth | |
| parent | 8b865fa9bf75e728d5d76f5a1460e0c37d8b5f9e (diff) | |
| parent | 7c7692933c21b77328a94eed714f66c276776197 (diff) | |
| download | go-tangerine-5b34fa538e54320778314081df97da561f7c6314.tar go-tangerine-5b34fa538e54320778314081df97da561f7c6314.tar.gz go-tangerine-5b34fa538e54320778314081df97da561f7c6314.tar.bz2 go-tangerine-5b34fa538e54320778314081df97da561f7c6314.tar.lz go-tangerine-5b34fa538e54320778314081df97da561f7c6314.tar.xz go-tangerine-5b34fa538e54320778314081df97da561f7c6314.tar.zst go-tangerine-5b34fa538e54320778314081df97da561f7c6314.zip | |
Merge pull request #1756 from obscuren/core-refactor
core, core/vm: refactor
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/blocktestcmd.go | 2 | ||||
| -rw-r--r-- | cmd/geth/js_test.go | 2 | ||||
| -rw-r--r-- | cmd/geth/main.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/geth/blocktestcmd.go b/cmd/geth/blocktestcmd.go index d6195e025..e0a5becdc 100644 --- a/cmd/geth/blocktestcmd.go +++ b/cmd/geth/blocktestcmd.go @@ -118,7 +118,7 @@ func runOneBlockTest(ctx *cli.Context, test *tests.BlockTest) (*eth.Ethereum, er return ethereum, fmt.Errorf("InsertPreState: %v", err) } - cm := ethereum.ChainManager() + cm := ethereum.BlockChain() validBlocks, err := test.TryBlocksInsert(cm) if err != nil { return ethereum, fmt.Errorf("Block Test load error: %v", err) diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 1f5b28e3a..2ad3d669c 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -196,7 +196,7 @@ func TestBlockChain(t *testing.T) { tmpfile := filepath.Join(extmp, "export.chain") tmpfileq := strconv.Quote(tmpfile) - ethereum.ChainManager().Reset() + ethereum.BlockChain().Reset() checkEvalJSON(t, repl, `admin.exportChain(`+tmpfileq+`)`, `true`) if _, err := os.Stat(tmpfile); err != nil { diff --git a/cmd/geth/main.go b/cmd/geth/main.go index a9aa9f61f..e8292fdf2 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -48,7 +48,7 @@ import ( const ( ClientIdentifier = "Geth" - Version = "1.2.0" + Version = "1.2.0-dev" VersionMajor = 1 VersionMinor = 2 VersionPatch = 0 |