diff options
| author | Felix Lange <fjl@twurst.com> | 2015-05-27 20:50:31 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-05-28 07:09:26 +0800 |
| commit | 74706a0f029fe74ea15e366904d827da03091fef (patch) | |
| tree | 716ff099fc17699e79cfb4cbd65d80221892a43a /cmd/geth/chaincmd.go | |
| parent | 8e4512a5e7eecb53f41996776d55fe7acc92330c (diff) | |
| download | dexon-74706a0f029fe74ea15e366904d827da03091fef.tar dexon-74706a0f029fe74ea15e366904d827da03091fef.tar.gz dexon-74706a0f029fe74ea15e366904d827da03091fef.tar.bz2 dexon-74706a0f029fe74ea15e366904d827da03091fef.tar.lz dexon-74706a0f029fe74ea15e366904d827da03091fef.tar.xz dexon-74706a0f029fe74ea15e366904d827da03091fef.tar.zst dexon-74706a0f029fe74ea15e366904d827da03091fef.zip | |
cmd/geth, cmd/utils: rename utils.Get* -> utils.Make*
The renaming should make it clearer that these functions create a new
instance for every call. @obscuren suggested this renaming a while ago.
Diffstat (limited to 'cmd/geth/chaincmd.go')
| -rw-r--r-- | cmd/geth/chaincmd.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index e17d1dc9b..1aed800f6 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -52,7 +52,7 @@ func importChain(ctx *cli.Context) { if len(ctx.Args()) != 1 { utils.Fatalf("This command requires an argument.") } - chain, blockDB, stateDB, extraDB := utils.GetChain(ctx) + chain, blockDB, stateDB, extraDB := utils.MakeChain(ctx) start := time.Now() if err := utils.ImportChain(chain, ctx.Args().First()); err != nil { utils.Fatalf("Import error: %v\n", err) @@ -65,7 +65,7 @@ func exportChain(ctx *cli.Context) { if len(ctx.Args()) != 1 { utils.Fatalf("This command requires an argument.") } - chain, _, _, _ := utils.GetChain(ctx) + chain, _, _, _ := utils.MakeChain(ctx) start := time.Now() if err := utils.ExportChain(chain, ctx.Args().First()); err != nil { utils.Fatalf("Export error: %v\n", err) @@ -95,7 +95,7 @@ func removeDB(ctx *cli.Context) { func upgradeDB(ctx *cli.Context) { glog.Infoln("Upgrading blockchain database") - chain, blockDB, stateDB, extraDB := utils.GetChain(ctx) + chain, blockDB, stateDB, extraDB := utils.MakeChain(ctx) v, _ := blockDB.Get([]byte("BlockchainVersion")) bcVersion := int(common.NewValue(v).Uint()) if bcVersion == 0 { @@ -113,7 +113,7 @@ func upgradeDB(ctx *cli.Context) { os.RemoveAll(filepath.Join(ctx.GlobalString(utils.DataDirFlag.Name), "state")) // Import the chain file. - chain, blockDB, stateDB, extraDB = utils.GetChain(ctx) + chain, blockDB, stateDB, extraDB = utils.MakeChain(ctx) blockDB.Put([]byte("BlockchainVersion"), common.NewValue(core.BlockChainVersion).Bytes()) err := utils.ImportChain(chain, exportFile) flushAll(blockDB, stateDB, extraDB) @@ -126,7 +126,7 @@ func upgradeDB(ctx *cli.Context) { } func dump(ctx *cli.Context) { - chain, _, stateDB, _ := utils.GetChain(ctx) + chain, _, stateDB, _ := utils.MakeChain(ctx) for _, arg := range ctx.Args() { var block *types.Block if hashish(arg) { |