fix: unit tests and withdrawableStake

ethersphere · Jul 22, 2024 · de841bd · de841bd
1 parent 74fbe6e
commit de841bd
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 272 deletions.
diff --git a/pkg/api/export_test.go b/pkg/api/export_test.go
@@ -95,7 +95,7 @@ type (
 	WalletResponse                    = walletResponse
 	WalletTxResponse                  = walletTxResponse
 	GetStakeResponse                  = getStakeResponse
-	WithdrawAllStakeResponse          = stakeTransactionReponse
+	StakeTransactionReponse           = stakeTransactionReponse
 	StatusSnapshotResponse            = statusSnapshotResponse
 	StatusResponse                    = statusResponse
 )

diff --git a/pkg/api/router.go b/pkg/api/router.go
@@ -563,7 +563,7 @@ func (s *Service) mountBusinessDebug() {
 		s.stakingAccessHandler,
 		s.gasConfigMiddleware("migrate stake"),
 		web.FinalHandler(jsonhttp.MethodHandler{
-			"POST": http.HandlerFunc(s.migrateStakeHandler), // TODO
+			"POST": http.HandlerFunc(s.migrateStakeHandler),
 		})),
 	)
 

diff --git a/pkg/api/staking_test.go b/pkg/api/staking_test.go
@@ -186,7 +186,7 @@ func TestWithdrawStake(t *testing.T) {
 		)
 		ts, _, _, _ := newTestServer(t, testServerOptions{StakingContract: contract})
 		jsonhttptest.Request(t, ts, http.MethodDelete, "/stake", http.StatusOK, jsonhttptest.WithExpectedJSONResponse(
-			&api.WithdrawAllStakeResponse{TxHash: txHash.String()}))
+			&api.StakeTransactionReponse{TxHash: txHash.String()}))
 	})
 
 	t.Run("with invalid stake amount", func(t *testing.T) {
@@ -252,7 +252,7 @@ func TestMigrateStake(t *testing.T) {
 		)
 		ts, _, _, _ := newTestServer(t, testServerOptions{StakingContract: contract})
 		jsonhttptest.Request(t, ts, http.MethodPost, "/stake/migrate", http.StatusOK, jsonhttptest.WithExpectedJSONResponse(
-			&api.WithdrawAllStakeResponse{TxHash: txHash.String()}))
+			&api.StakeTransactionReponse{TxHash: txHash.String()}))
 	})
 
 	t.Run("with invalid stake amount", func(t *testing.T) {

diff --git a/pkg/storageincentives/staking/contract.go b/pkg/storageincentives/staking/contract.go
@@ -176,7 +176,7 @@ func (c *contract) sendDepositStakeTransaction(ctx context.Context, stakedAmount
 	return receipt, nil
 }
 
-func (c *contract) getStake(ctx context.Context) (*big.Int, error) {
+func (c *contract) getEffectiveStake(ctx context.Context) (*big.Int, error) {
 	callData, err := c.stakingContractABI.Pack("nodeEffectiveStake", c.owner)
 	if err != nil {
 		return nil, err
@@ -201,6 +201,31 @@ func (c *contract) getStake(ctx context.Context) (*big.Int, error) {
 	return abi.ConvertType(results[0], new(big.Int)).(*big.Int), nil
 }
 
+func (c *contract) getwithdrawableStake(ctx context.Context) (*big.Int, error) {
+	callData, err := c.stakingContractABI.Pack("withdrawableStake")
+	if err != nil {
+		return nil, err
+	}
+	result, err := c.transactionService.Call(ctx, &transaction.TxRequest{
+		To:   &c.stakingContractAddress,
+		Data: callData,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("get stake: %w", err)
+	}
+
+	results, err := c.stakingContractABI.Unpack("withdrawableStake", result)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(results) == 0 {
+		return nil, errors.New("unexpected empty results")
+	}
+
+	return abi.ConvertType(results[0], new(big.Int)).(*big.Int), nil
+}
+
 func (c *contract) DepositStake(ctx context.Context, stakedAmount *big.Int) (common.Hash, error) {
 	prevStakedAmount, err := c.GetStake(ctx)
 	if err != nil {
@@ -247,7 +272,7 @@ func (c *contract) ChangeStakeOverlay(ctx context.Context, nonce common.Hash) (c
 }
 
 func (c *contract) GetStake(ctx context.Context) (*big.Int, error) {
-	stakedAmount, err := c.getStake(ctx)
+	stakedAmount, err := c.getEffectiveStake(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("staking contract: failed to get stake: %w", err)
 	}
@@ -281,7 +306,7 @@ func (c *contract) getBalance(ctx context.Context) (*big.Int, error) {
 }
 
 func (c *contract) WithdrawStake(ctx context.Context) (txHash common.Hash, err error) {
-	stakedAmount, err := c.getStake(ctx)
+	stakedAmount, err := c.getwithdrawableStake(ctx)
 	if err != nil {
 		return
 	}
@@ -309,7 +334,7 @@ func (c *contract) MigrateStake(ctx context.Context) (txHash common.Hash, err er
 		return common.Hash{}, ErrNotPaused
 	}
 
-	stakedAmount, err := c.getStake(ctx)
+	stakedAmount, err := c.getEffectiveStake(ctx)
 	if err != nil {
 		return
 	}