use only one claim function

stader/api/node/claim-rewards.go

@@ -3,11 +3,9 @@ package node
 import (
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/stader-labs/stader-node/shared/services"
 	"github.com/stader-labs/stader-node/shared/types/api"
 	"github.com/stader-labs/stader-node/stader-lib/node"
-	"github.com/stader-labs/stader-node/stader-lib/stader"
 	"github.com/urfave/cli"
 )
 
@@ -61,18 +59,10 @@ func CanClaimRewards(c *cli.Context) (*api.CanClaimRewards, error) {
 		return nil, err
 	}
 
-	var gasInfo stader.GasInfo
-	if operatorClaimVaultBalance.Cmp(withdrawableInEth) != 0 {
-		gasInfo, err = node.EstimateClaimOperatorRewardsWithAmount(orc, nodeAccount.Address, totalWithdrawableEth, opts)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		// estimate gas
-		gasInfo, err = node.EstimateClaimOperatorRewards(orc, opts)
-		if err != nil {
-			return nil, err
-		}
+	// estimate gas
+	gasInfo, err := node.EstimateClaimOperatorRewards(orc, opts)
+	if err != nil {
+		return nil, err
 	}
 
 	response.GasInfo = gasInfo
@@ -134,25 +124,17 @@ func ClaimRewards(c *cli.Context) (*api.ClaimRewards, error) {
 		return nil, err
 	}
 
+	totalWithdrawableEth := operatorRewardsBalance
+	if operatorRewardsBalance.Cmp(withdrawableInEth) > 0 {
+		totalWithdrawableEth = withdrawableInEth
+	}
+
 	// estimate gas
-	var tx *types.Transaction
-	if operatorRewardsBalance.Cmp(withdrawableInEth) == 0 {
-		tx, err = node.ClaimOperatorRewards(orc, opts)
-		if err != nil {
-			return nil, err
-		}
-		response.RewardsClaimed = operatorRewardsBalance
-	} else {
-		totalWithdrawableEth := operatorRewardsBalance
-		if operatorRewardsBalance.Cmp(withdrawableInEth) > 0 {
-			totalWithdrawableEth = withdrawableInEth
-		}
-		tx, err = node.ClaimOperatorRewardsWithAmount(orc, nodeAccount.Address, totalWithdrawableEth, opts)
-		if err != nil {
-			return nil, err
-		}
-		response.RewardsClaimed = totalWithdrawableEth
+	tx, err := node.ClaimOperatorRewards(orc, opts)
+	if err != nil {
+		return nil, err
 	}
+	response.RewardsClaimed = totalWithdrawableEth
 
 	response.TxHash = tx.Hash()