Skip to content

Commit 5f0f4c4

Browse files
AndresQuijanoAndresQuijano
committed
fix: feedback comments
1 parent fc9e27e commit 5f0f4c4

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

‎internal/configuration/registry/usecase.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ func NewUseCaseRegistry(
383383
lpRegistry.ColdWallet,
384384
btcRegistry.PaymentWallet,
385385
rskRegistry.Wallet,
386-
rskRegistry.Contracts.PegIn,
386+
rskRegistry.Contracts,
387387
messaging.Rpc,
388388
mutexes.BtcWalletMutex(),
389389
mutexes.RskWalletMutex(),

‎internal/usecases/liquidity_provider/transfer_excess_to_cold_wallet.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ type TransferExcessToColdWalletUseCase struct {
8484
coldWallet cold_wallet.ColdWallet
8585
btcWallet blockchain.BitcoinWallet
8686
rskWallet blockchain.RootstockWallet
87-
peginContract blockchain.PeginContract
87+
contracts blockchain.RskContracts
8888
rpc blockchain.Rpc
8989
btcWalletMutex sync.Locker
9090
rskWalletMutex sync.Locker
@@ -107,7 +107,7 @@ func NewTransferExcessToColdWalletUseCase(
107107
coldWallet cold_wallet.ColdWallet,
108108
btcWallet blockchain.BitcoinWallet,
109109
rskWallet blockchain.RootstockWallet,
110-
peginContract blockchain.PeginContract,
110+
contracts blockchain.RskContracts,
111111
rpc blockchain.Rpc,
112112
btcWalletMutex sync.Locker,
113113
rskWalletMutex sync.Locker,
@@ -128,7 +128,7 @@ func NewTransferExcessToColdWalletUseCase(
128128
coldWallet: coldWallet,
129129
btcWallet: btcWallet,
130130
rskWallet: rskWallet,
131-
peginContract: peginContract,
131+
contracts: contracts,
132132
rpc: rpc,
133133
btcWalletMutex: btcWalletMutex,
134134
rskWalletMutex: rskWalletMutex,
@@ -419,7 +419,7 @@ func (useCase *TransferExcessToColdWalletUseCase) handleRskTransfer(ctx context.
419419
// back to the hot wallet, ensuring contract funds are prioritized before cold wallet transfers.
420420
func (useCase *TransferExcessToColdWalletUseCase) withdrawContractFunds() {
421421
lpAddress := useCase.generalProvider.RskAddress()
422-
contractBalance, err := useCase.peginContract.GetBalance(lpAddress)
422+
contractBalance, err := useCase.contracts.PegIn.GetBalance(lpAddress)
423423
if err != nil {
424424
log.Errorf("TransferExcessToColdWallet: failed to get pegin contract balance: %v", err)
425425
return
@@ -428,7 +428,7 @@ func (useCase *TransferExcessToColdWalletUseCase) withdrawContractFunds() {
428428
return
429429
}
430430
log.Infof("TransferExcessToColdWallet: withdrawing %s wei from pegin contract", contractBalance.String())
431-
if err := useCase.peginContract.Withdraw(contractBalance); err != nil {
431+
if err := useCase.contracts.PegIn.Withdraw(contractBalance); err != nil {
432432
log.Errorf("TransferExcessToColdWallet: failed to withdraw from pegin contract: %v", err)
433433
}
434434
}

‎internal/usecases/liquidity_provider/transfer_excess_to_cold_wallet_test.go‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ func TestTransferExcessToColdWalletUseCase_Run_HappyPathBtcExcess(t *testing.T)
129129
coldWallet,
130130
btcWallet,
131131
rskWallet,
132-
peginContract,
132+
blockchain.RskContracts{PegIn: peginContract},
133133
rpc,
134134
btcWalletMutex,
135135
rskWalletMutex,
@@ -282,7 +282,7 @@ func TestTransferExcessToColdWalletUseCase_Run_HappyPathRskExcess(t *testing.T)
282282
coldWallet,
283283
btcWallet,
284284
rskWallet,
285-
peginContract,
285+
blockchain.RskContracts{PegIn: peginContract},
286286
rpc,
287287
btcWalletMutex,
288288
rskWalletMutex,
@@ -442,7 +442,7 @@ func TestTransferExcessToColdWalletUseCase_Run_HappyPathRskExcessWithContractFun
442442
coldWallet,
443443
btcWallet,
444444
rskWallet,
445-
peginContract,
445+
blockchain.RskContracts{PegIn: peginContract},
446446
rpc,
447447
btcWalletMutex,
448448
rskWalletMutex,
@@ -558,7 +558,7 @@ func TestTransferExcessToColdWalletUseCase_Run_RskExcess_GetContractBalanceFails
558558

559559
useCase := liquidity_provider.NewTransferExcessToColdWalletUseCase(
560560
peginProvider, pegoutProvider, generalProvider, lpRepository,
561-
coldWallet, btcWallet, rskWallet, peginContract, rpc,
561+
coldWallet, btcWallet, rskWallet, blockchain.RskContracts{PegIn: peginContract}, rpc,
562562
btcWalletMutex, rskWalletMutex,
563563
testBtcMinTransferFeeMultiplier, testRbtcMinTransferFeeMultiplier, testForceTransferAfterSeconds,
564564
eventBus, rskWallet, hashMock.Hash, alertSender, testAlertRecipientEmail,
@@ -653,7 +653,7 @@ func TestTransferExcessToColdWalletUseCase_Run_RskExcess_WithdrawContractFundsFa
653653

654654
useCase := liquidity_provider.NewTransferExcessToColdWalletUseCase(
655655
peginProvider, pegoutProvider, generalProvider, lpRepository,
656-
coldWallet, btcWallet, rskWallet, peginContract, rpc,
656+
coldWallet, btcWallet, rskWallet, blockchain.RskContracts{PegIn: peginContract}, rpc,
657657
btcWalletMutex, rskWalletMutex,
658658
testBtcMinTransferFeeMultiplier, testRbtcMinTransferFeeMultiplier, testForceTransferAfterSeconds,
659659
eventBus, rskWallet, hashMock.Hash, alertSender, testAlertRecipientEmail,
@@ -789,7 +789,7 @@ func TestTransferExcessToColdWalletUseCase_Run_HappyPathBothExcess(t *testing.T)
789789
coldWallet,
790790
btcWallet,
791791
rskWallet,
792-
peginContract,
792+
blockchain.RskContracts{PegIn: peginContract},
793793
rpc,
794794
btcWalletMutex,
795795
rskWalletMutex,
@@ -897,7 +897,7 @@ func TestTransferExcessToColdWalletUseCase_Run_NoExcess(t *testing.T) {
897897
coldWallet,
898898
btcWallet,
899899
rskWallet,
900-
peginContract,
900+
blockchain.RskContracts{PegIn: peginContract},
901901
rpc,
902902
btcWalletMutex,
903903
rskWalletMutex,
@@ -1031,7 +1031,7 @@ func TestTransferExcessToColdWalletUseCase_Run_FixedToleranceInsteadOfPercentage
10311031
coldWallet,
10321032
btcWallet,
10331033
rskWallet,
1034-
peginContract,
1034+
blockchain.RskContracts{PegIn: peginContract},
10351035
rpc,
10361036
btcWalletMutex,
10371037
rskWalletMutex,
@@ -1186,7 +1186,7 @@ func TestTransferExcessToColdWalletUseCase_Run_TimeForced(t *testing.T) {
11861186
coldWallet,
11871187
btcWallet,
11881188
rskWallet,
1189-
peginContract,
1189+
blockchain.RskContracts{PegIn: peginContract},
11901190
rpc,
11911191
btcWalletMutex,
11921192
rskWalletMutex,
@@ -1311,7 +1311,7 @@ func TestTransferExcessToColdWalletUseCase_Run_TimeForcedButNoExcess(t *testing.
13111311
coldWallet,
13121312
btcWallet,
13131313
rskWallet,
1314-
peginContract,
1314+
blockchain.RskContracts{PegIn: peginContract},
13151315
rpc,
13161316
btcWalletMutex,
13171317
rskWalletMutex,
@@ -1466,7 +1466,7 @@ func TestTransferExcessToColdWalletUseCase_Run_BtcTimeForcedRskThresholdExceeded
14661466
coldWallet,
14671467
btcWallet,
14681468
rskWallet,
1469-
peginContract,
1469+
blockchain.RskContracts{PegIn: peginContract},
14701470
rpc,
14711471
btcWalletMutex,
14721472
rskWalletMutex,
@@ -1642,7 +1642,7 @@ func TestTransferExcessToColdWalletUseCase_Run_RskTimeForcedBtcThresholdExceeded
16421642
coldWallet,
16431643
btcWallet,
16441644
rskWallet,
1645-
peginContract,
1645+
blockchain.RskContracts{PegIn: peginContract},
16461646
rpc,
16471647
btcWalletMutex,
16481648
rskWalletMutex,
@@ -1739,7 +1739,7 @@ func TestTransferExcessToColdWalletUseCase_Run_BtcColdWalletAddressEmpty(t *test
17391739
coldWallet,
17401740
btcWallet,
17411741
rskWallet,
1742-
peginContract,
1742+
blockchain.RskContracts{PegIn: peginContract},
17431743
rpc,
17441744
btcWalletMutex,
17451745
rskWalletMutex,
@@ -1800,7 +1800,7 @@ func TestTransferExcessToColdWalletUseCase_Run_RskColdWalletAddressEmpty(t *test
18001800
coldWallet,
18011801
btcWallet,
18021802
rskWallet,
1803-
peginContract,
1803+
blockchain.RskContracts{PegIn: peginContract},
18041804
rpc,
18051805
btcWalletMutex,
18061806
rskWalletMutex,
@@ -1872,7 +1872,7 @@ func TestTransferExcessToColdWalletUseCase_Run_MaxLiquidityNotConfigured(t *test
18721872
coldWallet,
18731873
btcWallet,
18741874
rskWallet,
1875-
peginContract,
1875+
blockchain.RskContracts{PegIn: peginContract},
18761876
rpc,
18771877
btcWalletMutex,
18781878
rskWalletMutex,
@@ -1954,7 +1954,7 @@ func TestTransferExcessToColdWalletUseCase_Run_BtcTransferHistoryNotConfigured(t
19541954
coldWallet,
19551955
btcWallet,
19561956
rskWallet,
1957-
peginContract,
1957+
blockchain.RskContracts{PegIn: peginContract},
19581958
rpc,
19591959
btcWalletMutex,
19601960
rskWalletMutex,
@@ -2037,7 +2037,7 @@ func TestTransferExcessToColdWalletUseCase_Run_RskTransferHistoryNotConfigured(t
20372037
coldWallet,
20382038
btcWallet,
20392039
rskWallet,
2040-
peginContract,
2040+
blockchain.RskContracts{PegIn: peginContract},
20412041
rpc,
20422042
btcWalletMutex,
20432043
rskWalletMutex,
@@ -2116,7 +2116,7 @@ func TestTransferExcessToColdWalletUseCase_Run_GetStateConfigurationFails(t *tes
21162116
coldWallet,
21172117
btcWallet,
21182118
rskWallet,
2119-
peginContract,
2119+
blockchain.RskContracts{PegIn: peginContract},
21202120
rpc,
21212121
btcWalletMutex,
21222122
rskWalletMutex,
@@ -2220,7 +2220,7 @@ func TestTransferExcessToColdWalletUseCase_Run_BtcExcessNotEconomical(t *testing
22202220
coldWallet,
22212221
btcWallet,
22222222
rskWallet,
2223-
peginContract,
2223+
blockchain.RskContracts{PegIn: peginContract},
22242224
rpc,
22252225
btcWalletMutex,
22262226
rskWalletMutex,
@@ -2343,7 +2343,7 @@ func TestTransferExcessToColdWalletUseCase_Run_RbtcExcessNotEconomical(t *testin
23432343
coldWallet,
23442344
btcWallet,
23452345
rskWallet,
2346-
peginContract,
2346+
blockchain.RskContracts{PegIn: peginContract},
23472347
rpc,
23482348
btcWalletMutex,
23492349
rskWalletMutex,
@@ -2447,7 +2447,7 @@ func TestTransferExcessToColdWalletUseCase_Run_GetBtcLiquidityFails(t *testing.T
24472447
coldWallet,
24482448
btcWallet,
24492449
rskWallet,
2450-
peginContract,
2450+
blockchain.RskContracts{PegIn: peginContract},
24512451
rpc,
24522452
btcWalletMutex,
24532453
rskWalletMutex,
@@ -2539,7 +2539,7 @@ func TestTransferExcessToColdWalletUseCase_Run_GetRbtcLiquidityFails(t *testing.
25392539
coldWallet,
25402540
btcWallet,
25412541
rskWallet,
2542-
peginContract,
2542+
blockchain.RskContracts{PegIn: peginContract},
25432543
rpc,
25442544
btcWalletMutex,
25452545
rskWalletMutex,
@@ -2639,7 +2639,7 @@ func TestTransferExcessToColdWalletUseCase_Run_BtcFeeEstimationFails(t *testing.
26392639
coldWallet,
26402640
btcWallet,
26412641
rskWallet,
2642-
peginContract,
2642+
blockchain.RskContracts{PegIn: peginContract},
26432643
rpc,
26442644
btcWalletMutex,
26452645
rskWalletMutex,
@@ -2753,7 +2753,7 @@ func TestTransferExcessToColdWalletUseCase_Run_BtcTransferFails(t *testing.T) {
27532753
coldWallet,
27542754
btcWallet,
27552755
rskWallet,
2756-
peginContract,
2756+
blockchain.RskContracts{PegIn: peginContract},
27572757
rpc,
27582758
btcWalletMutex,
27592759
rskWalletMutex,
@@ -2862,7 +2862,7 @@ func TestTransferExcessToColdWalletUseCase_Run_RskGasPriceRetrievalFails(t *test
28622862
coldWallet,
28632863
btcWallet,
28642864
rskWallet,
2865-
peginContract,
2865+
blockchain.RskContracts{PegIn: peginContract},
28662866
rpc,
28672867
btcWalletMutex,
28682868
rskWalletMutex,
@@ -2982,7 +2982,7 @@ func TestTransferExcessToColdWalletUseCase_Run_RbtcTransferFails(t *testing.T) {
29822982
coldWallet,
29832983
btcWallet,
29842984
rskWallet,
2985-
peginContract,
2985+
blockchain.RskContracts{PegIn: peginContract},
29862986
rpc,
29872987
btcWalletMutex,
29882988
rskWalletMutex,
@@ -3121,7 +3121,7 @@ func TestTransferExcessToColdWalletUseCase_Run_BtcSucceedsRskFails(t *testing.T)
31213121
coldWallet,
31223122
btcWallet,
31233123
rskWallet,
3124-
peginContract,
3124+
blockchain.RskContracts{PegIn: peginContract},
31253125
rpc,
31263126
btcWalletMutex,
31273127
rskWalletMutex,

0 commit comments

Comments
 (0)