Merge pull request ethereum#40 from benjyz/staking

staking instead of mining
ngtuna · Jun 19, 2018 · dfb2c64 · dfb2c64
2 parents 1208540 + de05b2d
commit dfb2c64
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/cmd/tomo/main.go b/cmd/tomo/main.go
@@ -290,7 +290,7 @@ func startNode(ctx *cli.Context, stack *node.Node) {
 		}
 		go func() {
 			started := false
-			ok, err := ethereum.ValidateMiner()
+			ok, err := ethereum.ValidateStaker()
 			if err != nil {
 				utils.Fatalf("Can't verify validator permission: %v", err)
 			}
@@ -307,8 +307,8 @@ func startNode(ctx *cli.Context, stack *node.Node) {
 				}
 				// Set the gas price to the limits from the CLI and start mining
 				ethereum.TxPool().SetGasPrice(utils.GlobalBig(ctx, utils.GasPriceFlag.Name))
-				if err := ethereum.StartMining(true); err != nil {
-					utils.Fatalf("Failed to start mining: %v", err)
+				if err := ethereum.StartStaking(true); err != nil {
+					utils.Fatalf("Failed to start staking: %v", err)
 				}
 				started = true
 				log.Info("Enabled mining node!!!")
@@ -317,7 +317,7 @@ func startNode(ctx *cli.Context, stack *node.Node) {
 
 			for range core.Checkpoint {
 				log.Info("Checkpoint!!! It's time to reconcile node's state...")
-				ok, err := ethereum.ValidateMiner()
+				ok, err := ethereum.ValidateStaker()
 				if err != nil {
 					utils.Fatalf("Can't verify validator permission: %v", err)
 				}
@@ -341,7 +341,7 @@ func startNode(ctx *cli.Context, stack *node.Node) {
 					}
 					// Set the gas price to the limits from the CLI and start mining
 					ethereum.TxPool().SetGasPrice(utils.GlobalBig(ctx, utils.GasPriceFlag.Name))
-					if err := ethereum.StartMining(true); err != nil {
+					if err := ethereum.StartStaking(true); err != nil {
 						utils.Fatalf("Failed to start mining: %v", err)
 					}
 					started = true

diff --git a/eth/api.go b/eth/api.go
@@ -96,7 +96,7 @@ func (api *PublicMinerAPI) SubmitWork(nonce types.BlockNonce, solution, digest c
 // result[2], 32 bytes hex encoded boundary condition ("target"), 2^256/difficulty
 func (api *PublicMinerAPI) GetWork() ([3]string, error) {
 	if !api.e.IsMining() {
-		if err := api.e.StartMining(false); err != nil {
+		if err := api.e.StartStaking(false); err != nil {
 			return [3]string{}, err
 		}
 	}
@@ -152,7 +152,7 @@ func (api *PrivateMinerAPI) Start(threads *int) error {
 		api.e.lock.RUnlock()
 
 		api.e.txPool.SetGasPrice(price)
-		return api.e.StartMining(true)
+		return api.e.StartStaking(true)
 	}
 	return nil
 }

diff --git a/eth/backend.go b/eth/backend.go
@@ -446,7 +446,7 @@ func (self *Ethereum) SetEtherbase(etherbase common.Address) {
 }
 
 // ValidateMiner checks if node's address is in set of validators
-func (s *Ethereum) ValidateMiner() (bool, error) {
+func (s *Ethereum) ValidateStaker() (bool, error) {
 	eb, err := s.Etherbase()
 	if err != nil {
 		return false, err
@@ -468,7 +468,7 @@ func (s *Ethereum) ValidateMiner() (bool, error) {
 	return true, nil
 }
 
-func (s *Ethereum) StartMining(local bool) error {
+func (s *Ethereum) StartStaking(local bool) error {
 	eb, err := s.Etherbase()
 	if err != nil {
 		log.Error("Cannot start mining without etherbase", "err", err)