Skip to content

Commit 7dac57d

Browse files
Luisfc68Luisfc68
committed
fix: linting issues
1 parent 2bc16f9 commit 7dac57d

3 files changed

Lines changed: 174 additions & 174 deletions

File tree

‎internal/usecases/common.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,21 @@ const (
7373
)
7474

7575
var (
76-
NonRecoverableError = errors.New("non recoverable")
77-
TxBelowMinimumError = errors.New("requested amount below bridge's min transaction value")
78-
RskAddressNotSupportedError = errors.New("rsk address not supported")
79-
QuoteNotFoundError = errors.New("quote not found")
80-
QuoteNotAcceptedError = errors.New("quote not accepted")
81-
ExpiredQuoteError = errors.New("expired quote")
82-
NoLiquidityError = errors.New("not enough liquidity")
83-
ProviderConfigurationError = errors.New("pegin and pegout providers are not using the same account")
84-
WrongStateError = errors.New("quote with wrong state")
85-
NoEnoughConfirmationsError = errors.New("not enough confirmations for transaction")
86-
InsufficientAmountError = errors.New("insufficient amount")
87-
AlreadyRegisteredError = errors.New("liquidity provider already registered")
88-
ProviderNotResignedError = errors.New("provided hasn't completed resignation process")
89-
IllegalQuoteStateError = errors.New("illegal quote state")
90-
LockingCapExceededError = errors.New("locking cap exceeded")
76+
NonRecoverableError = errors.New("non recoverable")
77+
TxBelowMinimumError = errors.New("requested amount below bridge's min transaction value")
78+
RskAddressNotSupportedError = errors.New("rsk address not supported")
79+
QuoteNotFoundError = errors.New("quote not found")
80+
QuoteNotAcceptedError = errors.New("quote not accepted")
81+
ExpiredQuoteError = errors.New("expired quote")
82+
NoLiquidityError = errors.New("not enough liquidity")
83+
ProviderConfigurationError = errors.New("pegin and pegout providers are not using the same account")
84+
WrongStateError = errors.New("quote with wrong state")
85+
NoEnoughConfirmationsError = errors.New("not enough confirmations for transaction")
86+
InsufficientAmountError = errors.New("insufficient amount")
87+
AlreadyRegisteredError = errors.New("liquidity provider already registered")
88+
ProviderNotResignedError = errors.New("provided hasn't completed resignation process")
89+
IllegalQuoteStateError = errors.New("illegal quote state")
90+
LockingCapExceededError = errors.New("locking cap exceeded")
9191
NonPositiveWeiError = errors.New("wei value must be positive")
9292
EmptyConfirmationsMapError = errors.New("confirmations map cannot be empty")
9393
NonPositiveConfirmationKeyError = errors.New("confirmation amount key must be positive")

‎internal/usecases/liquidity_provider/set_pegin_config_test.go‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -125,75 +125,75 @@ func TestSetPeginConfigUseCase_Run_ValidatePositiveWei(t *testing.T) {
125125
}
126126

127127
func TestSetPeginConfigUseCase_Run_ZeroFixedFee(t *testing.T) {
128-
lpRepository := &mocks.LiquidityProviderRepositoryMock{}
129-
walletMock := &mocks.RskWalletMock{}
130-
hashMock := &mocks.HashMock{}
131-
132-
cfg := lp.PeginConfiguration{
133-
TimeForDeposit: 1,
134-
CallTime: 2,
135-
PenaltyFee: entities.NewWei(3),
136-
FixedFee: entities.NewWei(0),
137-
FeePercentage: utils.NewBigFloat64(4.5),
138-
MaxValue: entities.NewWei(5),
139-
MinValue: entities.NewWei(1),
140-
}
141-
142-
bridge := &mocks.BridgeMock{}
143-
bridge.On("GetMinimumLockTxValue").Return(entities.NewWei(1), nil)
144-
contracts := blockchain.RskContracts{Bridge: bridge}
145-
146-
lpRepository.On("UpsertPeginConfiguration", test.AnyCtx, mock.Anything).Return(nil)
147-
walletMock.On("SignBytes", mock.Anything).Return([]byte{1,2,3}, nil)
148-
hashMock.On("Hash", mock.Anything).Return([]byte{4,5,6})
149-
150-
useCase := liquidity_provider.NewSetPeginConfigUseCase(lpRepository, walletMock, hashMock.Hash, contracts)
151-
152-
err := useCase.Run(context.Background(), cfg)
153-
require.NoError(t, err)
154-
bridge.AssertExpectations(t)
155-
lpRepository.AssertExpectations(t)
128+
lpRepository := &mocks.LiquidityProviderRepositoryMock{}
129+
walletMock := &mocks.RskWalletMock{}
130+
hashMock := &mocks.HashMock{}
131+
132+
cfg := lp.PeginConfiguration{
133+
TimeForDeposit: 1,
134+
CallTime: 2,
135+
PenaltyFee: entities.NewWei(3),
136+
FixedFee: entities.NewWei(0),
137+
FeePercentage: utils.NewBigFloat64(4.5),
138+
MaxValue: entities.NewWei(5),
139+
MinValue: entities.NewWei(1),
140+
}
141+
142+
bridge := &mocks.BridgeMock{}
143+
bridge.On("GetMinimumLockTxValue").Return(entities.NewWei(1), nil)
144+
contracts := blockchain.RskContracts{Bridge: bridge}
145+
146+
lpRepository.On("UpsertPeginConfiguration", test.AnyCtx, mock.Anything).Return(nil)
147+
walletMock.On("SignBytes", mock.Anything).Return([]byte{1, 2, 3}, nil)
148+
hashMock.On("Hash", mock.Anything).Return([]byte{4, 5, 6})
149+
150+
useCase := liquidity_provider.NewSetPeginConfigUseCase(lpRepository, walletMock, hashMock.Hash, contracts)
151+
152+
err := useCase.Run(context.Background(), cfg)
153+
require.NoError(t, err)
154+
bridge.AssertExpectations(t)
155+
lpRepository.AssertExpectations(t)
156156
}
157157

158158
func TestSetPegoutConfigUseCase_Run_ValidatePositiveWei_EachField(t *testing.T) {
159-
lpRepository := &mocks.LiquidityProviderRepositoryMock{}
160-
walletMock := &mocks.RskWalletMock{}
161-
hashMock := &mocks.HashMock{}
162-
163-
baseCfg := lp.PegoutConfiguration{
164-
TimeForDeposit: 1,
165-
ExpireTime: 2,
166-
PenaltyFee: entities.NewWei(3),
167-
FixedFee: entities.NewWei(4),
168-
FeePercentage: utils.NewBigFloat64(4.5),
169-
MaxValue: entities.NewWei(5),
170-
MinValue: entities.NewWei(1),
171-
ExpireBlocks: 10,
172-
BridgeTransactionMin: entities.NewWei(5),
173-
}
174-
175-
makeCfg := func(modify func(*lp.PegoutConfiguration)) lp.PegoutConfiguration {
176-
cfg := baseCfg
177-
modify(&cfg)
178-
return cfg
179-
}
180-
181-
cases := []lp.PegoutConfiguration{
182-
makeCfg(func(c *lp.PegoutConfiguration) { c.PenaltyFee = entities.NewWei(-1) }),
183-
makeCfg(func(c *lp.PegoutConfiguration) { c.FixedFee = entities.NewWei(-1) }),
184-
makeCfg(func(c *lp.PegoutConfiguration) { c.MaxValue = entities.NewWei(-1) }),
185-
makeCfg(func(c *lp.PegoutConfiguration) { c.MinValue = entities.NewWei(-1) }),
186-
makeCfg(func(c *lp.PegoutConfiguration) { c.BridgeTransactionMin = entities.NewWei(-1) }),
187-
}
188-
189-
for _, cfg := range cases {
190-
bridge := &mocks.BridgeMock{}
191-
bridge.On("GetMinimumLockTxValue").Return(entities.NewWei(1), nil).Maybe()
192-
contracts := blockchain.RskContracts{Bridge: bridge}
193-
194-
useCase := liquidity_provider.NewSetPegoutConfigUseCase(lpRepository, walletMock, hashMock.Hash, contracts)
195-
err := useCase.Run(context.Background(), cfg)
196-
require.ErrorIs(t, err, usecases.NonPositiveWeiError)
197-
bridge.AssertExpectations(t)
198-
}
159+
lpRepository := &mocks.LiquidityProviderRepositoryMock{}
160+
walletMock := &mocks.RskWalletMock{}
161+
hashMock := &mocks.HashMock{}
162+
163+
baseCfg := lp.PegoutConfiguration{
164+
TimeForDeposit: 1,
165+
ExpireTime: 2,
166+
PenaltyFee: entities.NewWei(3),
167+
FixedFee: entities.NewWei(4),
168+
FeePercentage: utils.NewBigFloat64(4.5),
169+
MaxValue: entities.NewWei(5),
170+
MinValue: entities.NewWei(1),
171+
ExpireBlocks: 10,
172+
BridgeTransactionMin: entities.NewWei(5),
173+
}
174+
175+
makeCfg := func(modify func(*lp.PegoutConfiguration)) lp.PegoutConfiguration {
176+
cfg := baseCfg
177+
modify(&cfg)
178+
return cfg
179+
}
180+
181+
cases := []lp.PegoutConfiguration{
182+
makeCfg(func(c *lp.PegoutConfiguration) { c.PenaltyFee = entities.NewWei(-1) }),
183+
makeCfg(func(c *lp.PegoutConfiguration) { c.FixedFee = entities.NewWei(-1) }),
184+
makeCfg(func(c *lp.PegoutConfiguration) { c.MaxValue = entities.NewWei(-1) }),
185+
makeCfg(func(c *lp.PegoutConfiguration) { c.MinValue = entities.NewWei(-1) }),
186+
makeCfg(func(c *lp.PegoutConfiguration) { c.BridgeTransactionMin = entities.NewWei(-1) }),
187+
}
188+
189+
for _, cfg := range cases {
190+
bridge := &mocks.BridgeMock{}
191+
bridge.On("GetMinimumLockTxValue").Return(entities.NewWei(1), nil).Maybe()
192+
contracts := blockchain.RskContracts{Bridge: bridge}
193+
194+
useCase := liquidity_provider.NewSetPegoutConfigUseCase(lpRepository, walletMock, hashMock.Hash, contracts)
195+
err := useCase.Run(context.Background(), cfg)
196+
require.ErrorIs(t, err, usecases.NonPositiveWeiError)
197+
bridge.AssertExpectations(t)
198+
}
199199
}

‎internal/usecases/liquidity_provider/set_pegout_config_test.go‎

Lines changed: 91 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -103,101 +103,101 @@ func TestSetPegoutConfigUseCase_Run_ErrorHandling(t *testing.T) {
103103
}
104104

105105
func TestSetPegoutConfigUseCase_Run_ValidatePositiveWei(t *testing.T) {
106-
lpRepository := &mocks.LiquidityProviderRepositoryMock{}
107-
walletMock := &mocks.RskWalletMock{}
108-
hashMock := &mocks.HashMock{}
109-
110-
invalidConfig := lp.PegoutConfiguration{
111-
TimeForDeposit: 1,
112-
ExpireTime: 2,
113-
PenaltyFee: entities.NewWei(-3),
114-
FixedFee: entities.NewWei(4),
115-
FeePercentage: utils.NewBigFloat64(4.5),
116-
MaxValue: entities.NewWei(5),
117-
MinValue: entities.NewWei(1),
118-
ExpireBlocks: 10,
119-
BridgeTransactionMin: entities.NewWei(5),
120-
}
121-
122-
bridge := &mocks.BridgeMock{}
123-
bridge.On("GetMinimumLockTxValue").Return(entities.NewWei(1), nil)
124-
contracts := blockchain.RskContracts{Bridge: bridge}
125-
126-
useCase := liquidity_provider.NewSetPegoutConfigUseCase(lpRepository, walletMock, hashMock.Hash, contracts)
127-
128-
err := useCase.Run(context.Background(), invalidConfig)
129-
require.ErrorIs(t, err, usecases.NonPositiveWeiError)
106+
lpRepository := &mocks.LiquidityProviderRepositoryMock{}
107+
walletMock := &mocks.RskWalletMock{}
108+
hashMock := &mocks.HashMock{}
109+
110+
invalidConfig := lp.PegoutConfiguration{
111+
TimeForDeposit: 1,
112+
ExpireTime: 2,
113+
PenaltyFee: entities.NewWei(-3),
114+
FixedFee: entities.NewWei(4),
115+
FeePercentage: utils.NewBigFloat64(4.5),
116+
MaxValue: entities.NewWei(5),
117+
MinValue: entities.NewWei(1),
118+
ExpireBlocks: 10,
119+
BridgeTransactionMin: entities.NewWei(5),
120+
}
121+
122+
bridge := &mocks.BridgeMock{}
123+
bridge.On("GetMinimumLockTxValue").Return(entities.NewWei(1), nil)
124+
contracts := blockchain.RskContracts{Bridge: bridge}
125+
126+
useCase := liquidity_provider.NewSetPegoutConfigUseCase(lpRepository, walletMock, hashMock.Hash, contracts)
127+
128+
err := useCase.Run(context.Background(), invalidConfig)
129+
require.ErrorIs(t, err, usecases.NonPositiveWeiError)
130130
}
131131

132132
func TestSetPegoutConfigUseCase_Run_ZeroFixedFee(t *testing.T) {
133-
lpRepository := &mocks.LiquidityProviderRepositoryMock{}
134-
walletMock := &mocks.RskWalletMock{}
135-
hashMock := &mocks.HashMock{}
136-
137-
cfg := lp.PegoutConfiguration{
138-
TimeForDeposit: 1,
139-
ExpireTime: 2,
140-
PenaltyFee: entities.NewWei(3),
141-
FixedFee: entities.NewWei(0),
142-
FeePercentage: utils.NewBigFloat64(4.5),
143-
MaxValue: entities.NewWei(5),
144-
MinValue: entities.NewWei(1),
145-
ExpireBlocks: 10,
146-
BridgeTransactionMin: entities.NewWei(5),
147-
}
148-
149-
bridge := &mocks.BridgeMock{}
150-
bridge.On("GetMinimumLockTxValue").Return(entities.NewWei(1), nil)
151-
contracts := blockchain.RskContracts{Bridge: bridge}
152-
153-
lpRepository.On("UpsertPegoutConfiguration", test.AnyCtx, mock.Anything).Return(nil)
154-
walletMock.On("SignBytes", mock.Anything).Return([]byte{1,2,3}, nil)
155-
hashMock.On("Hash", mock.Anything).Return([]byte{4,5,6})
156-
157-
useCase := liquidity_provider.NewSetPegoutConfigUseCase(lpRepository, walletMock, hashMock.Hash, contracts)
158-
159-
err := useCase.Run(context.Background(), cfg)
160-
require.NoError(t, err)
161-
bridge.AssertExpectations(t)
162-
lpRepository.AssertExpectations(t)
133+
lpRepository := &mocks.LiquidityProviderRepositoryMock{}
134+
walletMock := &mocks.RskWalletMock{}
135+
hashMock := &mocks.HashMock{}
136+
137+
cfg := lp.PegoutConfiguration{
138+
TimeForDeposit: 1,
139+
ExpireTime: 2,
140+
PenaltyFee: entities.NewWei(3),
141+
FixedFee: entities.NewWei(0),
142+
FeePercentage: utils.NewBigFloat64(4.5),
143+
MaxValue: entities.NewWei(5),
144+
MinValue: entities.NewWei(1),
145+
ExpireBlocks: 10,
146+
BridgeTransactionMin: entities.NewWei(5),
147+
}
148+
149+
bridge := &mocks.BridgeMock{}
150+
bridge.On("GetMinimumLockTxValue").Return(entities.NewWei(1), nil)
151+
contracts := blockchain.RskContracts{Bridge: bridge}
152+
153+
lpRepository.On("UpsertPegoutConfiguration", test.AnyCtx, mock.Anything).Return(nil)
154+
walletMock.On("SignBytes", mock.Anything).Return([]byte{1, 2, 3}, nil)
155+
hashMock.On("Hash", mock.Anything).Return([]byte{4, 5, 6})
156+
157+
useCase := liquidity_provider.NewSetPegoutConfigUseCase(lpRepository, walletMock, hashMock.Hash, contracts)
158+
159+
err := useCase.Run(context.Background(), cfg)
160+
require.NoError(t, err)
161+
bridge.AssertExpectations(t)
162+
lpRepository.AssertExpectations(t)
163163
}
164164

165165
func TestSetPeginConfigUseCase_Run_ValidatePositiveWei_EachField(t *testing.T) {
166-
lpRepository := &mocks.LiquidityProviderRepositoryMock{}
167-
walletMock := &mocks.RskWalletMock{}
168-
hashMock := &mocks.HashMock{}
169-
170-
baseCfg := lp.PeginConfiguration{
171-
TimeForDeposit: 1,
172-
CallTime: 2,
173-
PenaltyFee: entities.NewWei(3),
174-
FixedFee: entities.NewWei(4),
175-
FeePercentage: utils.NewBigFloat64(4.5),
176-
MaxValue: entities.NewWei(5),
177-
MinValue: entities.NewWei(1),
178-
}
179-
180-
makeCfg := func(modify func(*lp.PeginConfiguration)) lp.PeginConfiguration {
181-
cfg := baseCfg
182-
modify(&cfg)
183-
return cfg
184-
}
185-
186-
cases := []lp.PeginConfiguration{
187-
makeCfg(func(c *lp.PeginConfiguration) { c.PenaltyFee = entities.NewWei(-1) }),
188-
makeCfg(func(c *lp.PeginConfiguration) { c.FixedFee = entities.NewWei(-1) }),
189-
makeCfg(func(c *lp.PeginConfiguration) { c.MaxValue = entities.NewWei(-1) }),
190-
makeCfg(func(c *lp.PeginConfiguration) { c.MinValue = entities.NewWei(-1) }),
191-
}
192-
193-
for _, cfg := range cases {
194-
bridge := &mocks.BridgeMock{}
195-
bridge.On("GetMinimumLockTxValue").Return(entities.NewWei(1), nil)
196-
contracts := blockchain.RskContracts{Bridge: bridge}
197-
198-
useCase := liquidity_provider.NewSetPeginConfigUseCase(lpRepository, walletMock, hashMock.Hash, contracts)
199-
err := useCase.Run(context.Background(), cfg)
200-
require.ErrorIs(t, err, usecases.NonPositiveWeiError)
201-
bridge.AssertNotCalled(t, "GetMinimumLockTxValue")
202-
}
166+
lpRepository := &mocks.LiquidityProviderRepositoryMock{}
167+
walletMock := &mocks.RskWalletMock{}
168+
hashMock := &mocks.HashMock{}
169+
170+
baseCfg := lp.PeginConfiguration{
171+
TimeForDeposit: 1,
172+
CallTime: 2,
173+
PenaltyFee: entities.NewWei(3),
174+
FixedFee: entities.NewWei(4),
175+
FeePercentage: utils.NewBigFloat64(4.5),
176+
MaxValue: entities.NewWei(5),
177+
MinValue: entities.NewWei(1),
178+
}
179+
180+
makeCfg := func(modify func(*lp.PeginConfiguration)) lp.PeginConfiguration {
181+
cfg := baseCfg
182+
modify(&cfg)
183+
return cfg
184+
}
185+
186+
cases := []lp.PeginConfiguration{
187+
makeCfg(func(c *lp.PeginConfiguration) { c.PenaltyFee = entities.NewWei(-1) }),
188+
makeCfg(func(c *lp.PeginConfiguration) { c.FixedFee = entities.NewWei(-1) }),
189+
makeCfg(func(c *lp.PeginConfiguration) { c.MaxValue = entities.NewWei(-1) }),
190+
makeCfg(func(c *lp.PeginConfiguration) { c.MinValue = entities.NewWei(-1) }),
191+
}
192+
193+
for _, cfg := range cases {
194+
bridge := &mocks.BridgeMock{}
195+
bridge.On("GetMinimumLockTxValue").Return(entities.NewWei(1), nil)
196+
contracts := blockchain.RskContracts{Bridge: bridge}
197+
198+
useCase := liquidity_provider.NewSetPeginConfigUseCase(lpRepository, walletMock, hashMock.Hash, contracts)
199+
err := useCase.Run(context.Background(), cfg)
200+
require.ErrorIs(t, err, usecases.NonPositiveWeiError)
201+
bridge.AssertNotCalled(t, "GetMinimumLockTxValue")
202+
}
203203
}

0 commit comments

Comments
 (0)