Copilot comments

Author: AndresQuijano

internal/adapters/entrypoints/watcher/transfer_cold_wallet_watcher.go

@@ -69,38 +69,22 @@ func (watcher *TransferColdWalletWatcher) logTransferResult(result *liquidity_pr
 	if result == nil {
 		return
 	}
+	watcher.logNetworkTransferResult("BTC", result.BtcResult)
+	watcher.logNetworkTransferResult("RSK", result.RskResult)
+}
 
-	// Log BTC transfer result
-	switch result.BtcResult.Status {
-	case liquidity_provider.TransferStatusSuccess:
-		log.Infof("TransferColdWalletWatcher: BTC transfer successful - TxHash: %s, Amount: %s, Fee: %s",
-			result.BtcResult.TxHash,
-			result.BtcResult.Amount.String(),
-			result.BtcResult.Fee.String())
-	case liquidity_provider.TransferStatusSkippedNoExcess:
-		log.Info("TransferColdWalletWatcher: BTC transfer skipped - no excess liquidity")
-	case liquidity_provider.TransferStatusSkippedNotEconomical:
-		log.Info("TransferColdWalletWatcher: BTC transfer skipped - not economical: ", result.BtcResult.Message)
-	case liquidity_provider.TransferStatusFailed:
-		log.Errorf("TransferColdWalletWatcher: BTC transfer failed - %s: %v",
-			result.BtcResult.Message,
-			result.BtcResult.Error)
-	}
-
-	// Log RSK transfer result
-	switch result.RskResult.Status {
+func (watcher *TransferColdWalletWatcher) logNetworkTransferResult(network string, result liquidity_provider.NetworkTransferResult) {
+	switch result.Status {
 	case liquidity_provider.TransferStatusSuccess:
-		log.Infof("TransferColdWalletWatcher: RSK transfer successful - TxHash: %s, Amount: %s, Fee: %s",
-			result.RskResult.TxHash,
-			result.RskResult.Amount.String(),
-			result.RskResult.Fee.String())
+		log.Infof("TransferColdWalletWatcher: %s transfer successful - TxHash: %s, Amount: %s, Fee: %s",
+			network, result.TxHash, result.Amount.String(), result.Fee.String())
 	case liquidity_provider.TransferStatusSkippedNoExcess:
-		log.Info("TransferColdWalletWatcher: RSK transfer skipped - no excess liquidity")
+		log.Infof("TransferColdWalletWatcher: %s transfer skipped - no excess liquidity", network)
 	case liquidity_provider.TransferStatusSkippedNotEconomical:
-		log.Info("TransferColdWalletWatcher: RSK transfer skipped - not economical: ", result.RskResult.Message)
+		log.Infof("TransferColdWalletWatcher: %s transfer skipped - not economical: %s", network, result.Message)
+	case liquidity_provider.TransferStatusSkippedCooldown:
+		log.Infof("TransferColdWalletWatcher: %s transfer skipped - liquidity target cooldown active", network)
 	case liquidity_provider.TransferStatusFailed:
-		log.Errorf("TransferColdWalletWatcher: RSK transfer failed - %s: %v",
-			result.RskResult.Message,
-			result.RskResult.Error)
+		log.Errorf("TransferColdWalletWatcher: %s transfer failed - %s: %v", network, result.Message, result.Error)
 	}
 }

internal/usecases/liquidity_provider/initialize_state_configuration.go

@@ -13,7 +13,7 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-const CoolDownAfterRatioChange int64 = 10800 // 3 hours
+const CooldownAfterRatioChange int64 = 10800 // 3 hours
 
 type InitializeStateConfigurationUseCase struct {
 	provider                     liquidity_provider.LiquidityProvider
@@ -108,7 +108,7 @@ func (useCase *InitializeStateConfigurationUseCase) applyRatioUpdate(stateConfig
 		log.Infof("BtcLiquidityTargetPercentage changed from %d to %d, activating cooldown",
 			stateConfig.BtcLiquidityTargetPercentage, useCase.btcLiquidityTargetPercentage)
 		stateConfig.BtcLiquidityTargetPercentage = useCase.btcLiquidityTargetPercentage
-		stateConfig.RatioCooldownEndTimestamp = now + CoolDownAfterRatioChange
+		stateConfig.RatioCooldownEndTimestamp = now + CooldownAfterRatioChange
 		return stateConfig, true
 	}
 	return stateConfig, false

internal/usecases/liquidity_provider/initialize_state_configuration_test.go

@@ -291,7 +291,7 @@ func TestInitializeStateConfigurationUseCase_Run_RatioChangeActivatesCooldown(t
 	walletMock.AssertExpectations(t)
 
 	assert.Equal(t, uint64(60), capturedConfig.Value.BtcLiquidityTargetPercentage)
-	expectedCooldownEnd := time.Now().Unix() + liquidity_provider.CoolDownAfterRatioChange
+	expectedCooldownEnd := time.Now().Unix() + liquidity_provider.CooldownAfterRatioChange
 	cooldownDiff := expectedCooldownEnd - capturedConfig.Value.RatioCooldownEndTimestamp
 	assert.True(t, cooldownDiff >= 0 && cooldownDiff < 5, "cooldown end timestamp should be approximately now + 3 hours")
 }

internal/usecases/liquidity_provider/transfer_excess_to_cold_wallet.go

@@ -35,6 +35,7 @@ const (
 	TransferStatusSkippedNoExcess      TransferStatus = "skipped_no_excess"
 	TransferStatusSkippedNotEconomical TransferStatus = "skipped_not_economical"
 	TransferStatusFailed               TransferStatus = "failed"
+	TransferStatusSkippedCooldown      TransferStatus = "skipped_cooldown"
 )
 
 type NetworkTransferResult struct {
@@ -159,7 +160,11 @@ func (useCase *TransferExcessToColdWalletUseCase) Run(ctx context.Context) (*Tra
 
 	if time.Now().Unix() < stateConfig.RatioCooldownEndTimestamp {
 		log.Infof("TransferExcessToColdWallet: skipping due to liquidity target cooldown (ends at %d)", stateConfig.RatioCooldownEndTimestamp)
-		return NewTransferToColdWalletResult(NetworkTransferResult{}, NetworkTransferResult{}), nil
+		cooldownResult := NetworkTransferResult{
+			Status:  TransferStatusSkippedCooldown,
+			Message: "Skipped due to liquidity target cooldown",
+		}
+		return NewTransferToColdWalletResult(cooldownResult, cooldownResult), nil
 	}
 
 	currentLiquidity, err := useCase.getCurrentLiquidity(ctx)
@@ -253,7 +258,6 @@ func (useCase *TransferExcessToColdWalletUseCase) calculateExcessForBothNetworks
 	currentLiquidity currentLiquidityResult,
 ) (excessCalculationResult, error) {
 	btcPercentage := stateConfig.BtcLiquidityTargetPercentage
-	rbtcPercentage := 100 - btcPercentage
 
 	btcTarget, err := new(entities.Wei).Div(
 		new(entities.Wei).Mul(generalConfig.MaxLiquidity, entities.NewUWei(btcPercentage)),
@@ -263,13 +267,7 @@ func (useCase *TransferExcessToColdWalletUseCase) calculateExcessForBothNetworks
 		return excessCalculationResult{}, err
 	}
 
-	rbtcTarget, err := new(entities.Wei).Div(
-		new(entities.Wei).Mul(generalConfig.MaxLiquidity, entities.NewUWei(rbtcPercentage)),
-		entities.NewUWei(100),
-	)
-	if err != nil {
-		return excessCalculationResult{}, err
-	}
+	rbtcTarget := new(entities.Wei).Sub(generalConfig.MaxLiquidity, btcTarget)
 
 	btcThreshold := useCase.calculateThreshold(btcTarget, generalConfig.ExcessTolerance)
 	rbtcThreshold := useCase.calculateThreshold(rbtcTarget, generalConfig.ExcessTolerance)

internal/usecases/liquidity_provider/transfer_excess_to_cold_wallet_test.go

@@ -3247,13 +3247,13 @@ func TestTransferExcessToColdWalletUseCase_Run_CooldownActiveSkipsTransfer(t *te
 	require.NoError(t, err)
 	require.NotNil(t, result)
 
-	assert.Equal(t, liquidity_provider.TransferStatus(""), result.BtcResult.Status)
+	assert.Equal(t, liquidity_provider.TransferStatusSkippedCooldown, result.BtcResult.Status)
 	assert.Empty(t, result.BtcResult.TxHash)
 	assert.Nil(t, result.BtcResult.Amount)
 	assert.Nil(t, result.BtcResult.Fee)
 	require.NoError(t, result.BtcResult.Error)
 
-	assert.Equal(t, liquidity_provider.TransferStatus(""), result.RskResult.Status)
+	assert.Equal(t, liquidity_provider.TransferStatusSkippedCooldown, result.RskResult.Status)
 	assert.Empty(t, result.RskResult.TxHash)
 	assert.Nil(t, result.RskResult.Amount)
 	assert.Nil(t, result.RskResult.Fee)