minSafeRazor fix (#669)

Author: shekhar2807

utils/block.go

@@ -102,26 +102,6 @@ func (*UtilsStruct) GetMinStakeAmount(client *ethclient.Client) (*big.Int, error
 	return minStake, nil
 }
 
-func (*UtilsStruct) GetMinSafeRazor(client *ethclient.Client) (*big.Int, error) {
-	var (
-		minStake *big.Int
-		err      error
-	)
-	err = retry.Do(
-		func() error {
-			minStake, err = BlockManagerInterface.MinStake(client)
-			if err != nil {
-				log.Error("Error in fetching minimum stake amount.... Retrying")
-				return err
-			}
-			return nil
-		}, RetryInterface.RetryAttempts(core.MaxRetries))
-	if err != nil {
-		return nil, err
-	}
-	return minStake, nil
-}
-
 func (*UtilsStruct) GetMaxAltBlocks(client *ethclient.Client) (uint8, error) {
 	var (
 		maxAltBlocks uint8

utils/interface.go

@@ -250,7 +250,7 @@ type StakeManagerUtils interface {
 	GetStakerId(client *ethclient.Client, address common.Address) (uint32, error)
 	GetStaker(*ethclient.Client, uint32) (bindings.StructsStaker, error)
 	GetNumStakers(*ethclient.Client) (uint32, error)
-	GetMinSafeRazor(client *ethclient.Client) (*big.Int, error)
+	MinSafeRazor(client *ethclient.Client) (*big.Int, error)
 	Locks(client *ethclient.Client, address common.Address, address1 common.Address, lockType uint8) (types.Locks, error)
 	MaxCommission(*ethclient.Client) (uint8, error)
 	EpochLimitForUpdateCommission(*ethclient.Client) (uint16, error)

utils/mocks/stake_manager_utils.go

@@ -190,3 +190,23 @@ func (*UtilsStruct) GetStakerSRZRBalance(client *ethclient.Client, staker bindin
 	}
 	return sRZRBalance, nil
 }
+
+func (*UtilsStruct) GetMinSafeRazor(client *ethclient.Client) (*big.Int, error) {
+	var (
+		minSafeRazor *big.Int
+		err          error
+	)
+	err = retry.Do(
+		func() error {
+			minSafeRazor, err = StakeManagerInterface.MinSafeRazor(client)
+			if err != nil {
+				log.Error("Error in fetching minimum safe razor.... Retrying")
+				return err
+			}
+			return nil
+		}, RetryInterface.RetryAttempts(core.MaxRetries))
+	if err != nil {
+		return nil, err
+	}
+	return minSafeRazor, nil
+}

utils/stake.go

@@ -151,7 +151,7 @@ func (s StakeManagerStruct) GetNumStakers(client *ethclient.Client) (uint32, err
 	return stakeManager.GetNumStakers(&opts)
 }
 
-func (s StakeManagerStruct) GetMinSafeRazor(client *ethclient.Client) (*big.Int, error) {
+func (s StakeManagerStruct) MinSafeRazor(client *ethclient.Client) (*big.Int, error) {
 	stakeManager, opts := UtilsInterface.GetStakeManagerWithOpts(client)
 	return stakeManager.MinSafeRazor(&opts)
 }