diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-03-06 23:20:25 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@users.noreply.github.com> | 2017-03-09 22:50:14 +0800 |
| commit | b7d93500f13e3054c81196273ebf676ad8ecb5ba (patch) | |
| tree | 1b6c60cbb6b235d87f78ff9a814f1a574510215a /cmd/geth | |
| parent | df72e20cc521b43092b9e3cc684836d4d673e126 (diff) | |
| download | go-tangerine-b7d93500f13e3054c81196273ebf676ad8ecb5ba.tar go-tangerine-b7d93500f13e3054c81196273ebf676ad8ecb5ba.tar.gz go-tangerine-b7d93500f13e3054c81196273ebf676ad8ecb5ba.tar.bz2 go-tangerine-b7d93500f13e3054c81196273ebf676ad8ecb5ba.tar.lz go-tangerine-b7d93500f13e3054c81196273ebf676ad8ecb5ba.tar.xz go-tangerine-b7d93500f13e3054c81196273ebf676ad8ecb5ba.tar.zst go-tangerine-b7d93500f13e3054c81196273ebf676ad8ecb5ba.zip | |
all: finish integrating Go ethash, delete C++ vendor
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/main.go | 2 | ||||
| -rw-r--r-- | cmd/geth/misccmd.go | 4 | ||||
| -rw-r--r-- | cmd/geth/usage.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index bf5e81d45..cc6d3ac6a 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -95,6 +95,7 @@ func init() { utils.EthashCachesInMemoryFlag, utils.EthashCachesOnDiskFlag, utils.EthashDatasetDirFlag, + utils.EthashDatasetsInMemoryFlag, utils.EthashDatasetsOnDiskFlag, utils.FastSyncFlag, utils.LightModeFlag, @@ -111,7 +112,6 @@ func init() { utils.GasPriceFlag, utils.MinerThreadsFlag, utils.MiningEnabledFlag, - utils.AutoDAGFlag, utils.TargetGasLimitFlag, utils.NATFlag, utils.NoDiscoverFlag, diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index 077f1ad11..073c36beb 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -25,10 +25,10 @@ import ( "strconv" "strings" - "github.com/ethereum/ethash" "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/params" + "github.com/ethereum/go-ethereum/pow" "gopkg.in/urfave/cli.v1" ) @@ -87,7 +87,7 @@ func makedag(ctx *cli.Context) error { utils.Fatalf("Can't find dir") } fmt.Println("making DAG, this could take awhile...") - ethash.MakeDAG(blockNum, dir) + pow.MakeDataset(blockNum, dir) } default: wrongArgs() diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index 34910daa5..74768f507 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -84,6 +84,7 @@ var AppHelpFlagGroups = []flagGroup{ utils.EthashCachesInMemoryFlag, utils.EthashCachesOnDiskFlag, utils.EthashDatasetDirFlag, + utils.EthashDatasetsInMemoryFlag, utils.EthashDatasetsOnDiskFlag, }, }, @@ -141,7 +142,6 @@ var AppHelpFlagGroups = []flagGroup{ Flags: []cli.Flag{ utils.MiningEnabledFlag, utils.MinerThreadsFlag, - utils.AutoDAGFlag, utils.EtherbaseFlag, utils.TargetGasLimitFlag, utils.GasPriceFlag, |