Skip to content

Commit fdb6502

Browse files
RomuloSiebraRomuloSiebra
committed
fix typo and variable names
1 parent 099af2d commit fdb6502

File tree

11 files changed

+29
-29
lines changed

11 files changed

+29
-29
lines changed

‎bridges/ethKc/bridgeExecutor.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ type ArgsBridgeExecutor struct {
3535
BalanceValidator BalanceValidator
3636
MaxQuorumRetriesOnEthereum uint64
3737
MaxQuorumRetriesOnKc uint64
38-
MaxRestriesOnWasProposed uint64
38+
MaxRetriesOnWasProposed uint64
3939
}
4040

4141
type bridgeExecutor struct {
@@ -103,9 +103,9 @@ func checkArgs(args ArgsBridgeExecutor) error {
103103
return fmt.Errorf("%w for args.MaxQuorumRetriesOnKc, got: %d, minimum: %d",
104104
clients.ErrInvalidValue, args.MaxQuorumRetriesOnKc, minRetries)
105105
}
106-
if args.MaxRestriesOnWasProposed < minRetries {
107-
return fmt.Errorf("%w for args.MaxRestriesOnWasProposed, got: %d, minimum: %d",
108-
clients.ErrInvalidValue, args.MaxRestriesOnWasProposed, minRetries)
106+
if args.MaxRetriesOnWasProposed < minRetries {
107+
return fmt.Errorf("%w for args.MaxRetriesOnWasProposed, got: %d, minimum: %d",
108+
clients.ErrInvalidValue, args.MaxRetriesOnWasProposed, minRetries)
109109
}
110110
return nil
111111
}
@@ -122,7 +122,7 @@ func createBridgeExecutor(args ArgsBridgeExecutor) *bridgeExecutor {
122122
balanceValidator: args.BalanceValidator,
123123
maxQuorumRetriesOnEthereum: args.MaxQuorumRetriesOnEthereum,
124124
maxQuorumRetriesOnKc: args.MaxQuorumRetriesOnKc,
125-
maxRetriesOnWasProposed: args.MaxRestriesOnWasProposed,
125+
maxRetriesOnWasProposed: args.MaxRetriesOnWasProposed,
126126
}
127127
}
128128

‎bridges/ethKc/bridgeExecutor_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func createMockExecutorArgs() ArgsBridgeExecutor {
3737
BalanceValidator: &testsCommon.BalanceValidatorStub{},
3838
MaxQuorumRetriesOnEthereum: minRetries,
3939
MaxQuorumRetriesOnKc: minRetries,
40-
MaxRestriesOnWasProposed: minRetries,
40+
MaxRetriesOnWasProposed: minRetries,
4141
}
4242
}
4343

@@ -146,16 +146,16 @@ func TestNewBridgeExecutor(t *testing.T) {
146146
assert.True(t, errors.Is(err, clients.ErrInvalidValue))
147147
assert.True(t, strings.Contains(err.Error(), "for args.MaxQuorumRetriesOnKc"))
148148
})
149-
t.Run("invalid MaxRestriesOnWasProposed value", func(t *testing.T) {
149+
t.Run("invalid MaxRetriesOnWasProposed value", func(t *testing.T) {
150150
t.Parallel()
151151

152152
args := createMockExecutorArgs()
153-
args.MaxRestriesOnWasProposed = 0
153+
args.MaxRetriesOnWasProposed = 0
154154
executor, err := NewBridgeExecutor(args)
155155

156156
assert.True(t, check.IfNil(executor))
157157
assert.True(t, errors.Is(err, clients.ErrInvalidValue))
158-
assert.True(t, strings.Contains(err.Error(), "for args.MaxRestriesOnWasProposed"))
158+
assert.True(t, strings.Contains(err.Error(), "for args.MaxRetriesOnWasProposed"))
159159
})
160160
t.Run("should work", func(t *testing.T) {
161161
t.Parallel()
@@ -949,7 +949,7 @@ func TestEthToKcBridgeExecutor_RetriesCountOnWasTransferProposedOnKc(t *testing.
949949
t.Parallel()
950950

951951
args := createMockExecutorArgs()
952-
args.MaxRestriesOnWasProposed = expectedMaxRetries
952+
args.MaxRetriesOnWasProposed = expectedMaxRetries
953953
executor, _ := NewBridgeExecutor(args)
954954
for i := uint64(0); i < expectedMaxRetries; i++ {
955955
assert.False(t, executor.ProcessMaxRetriesOnWasTransferProposedOnKc())

‎bridges/ethKc/interface.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type KcClient interface {
2424
GetActionIDForSetStatusOnPendingTransfer(ctx context.Context, batch *bridgeCore.TransferBatch) (uint64, error)
2525
GetLastExecutedEthBatchID(ctx context.Context) (uint64, error)
2626
GetLastExecutedEthTxID(ctx context.Context) (uint64, error)
27-
GetLastKlvBatchID(ctx context.Context) (uint64, error)
27+
GetLastKcBatchID(ctx context.Context) (uint64, error)
2828
GetCurrentNonce(ctx context.Context) (uint64, error)
2929

3030
ProposeSetStatus(ctx context.Context, batch *bridgeCore.TransferBatch) (string, error)

‎clients/balanceValidator/balanceValidator.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ func getTotalAmountFromBatch(batch *bridgeCore.TransferBatch, token []byte) *big
269269
}
270270

271271
func (validator *balanceValidator) getTotalTransferAmountInPendingKlvBatches(ctx context.Context, kdaToken []byte) (*big.Int, error) {
272-
batchID, err := validator.kcClient.GetLastKlvBatchID(ctx)
272+
batchID, err := validator.kcClient.GetLastKcBatchID(ctx)
273273
if err != nil {
274274
return nil, err
275275
}

‎clients/balanceValidator/balanceValidator_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,13 +345,13 @@ func TestBridgeExecutor_CheckToken(t *testing.T) {
345345
assert.False(t, result.checkRequiredBalanceOnEthCalled)
346346
assert.True(t, result.checkRequiredBalanceOnKlvCalled)
347347
})
348-
t.Run("on computeKlvAmount, GetLastKlvBatchID", func(t *testing.T) {
348+
t.Run("on computeKlvAmount, GetLastKcBatchID", func(t *testing.T) {
349349
cfg := testConfiguration{
350350
direction: batchProcessor.ToKc,
351351
isMintBurnOnKlv: true,
352352
isNativeOnEth: true,
353353
errorsOnCalls: map[string]error{
354-
"GetLastKlvBatchID": expectedError,
354+
"GetLastKcBatchID": expectedError,
355355
},
356356
}
357357
result := validatorTester(cfg)
@@ -1454,8 +1454,8 @@ func validatorTester(cfg testConfiguration) testResult {
14541454

14551455
return cfg.lastExecutedEthBatch, nil
14561456
},
1457-
GetLastKlvBatchIDCalled: func(ctx context.Context) (uint64, error) {
1458-
err := cfg.errorsOnCalls["GetLastKlvBatchID"]
1457+
GetLastKcBatchIDCalled: func(ctx context.Context) (uint64, error) {
1458+
err := cfg.errorsOnCalls["GetLastKcBatchID"]
14591459
if err != nil {
14601460
return 0, err
14611461
}

‎clients/balanceValidator/interface.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type KcClient interface {
1313
GetPendingBatch(ctx context.Context) (*bridgeCore.TransferBatch, error)
1414
GetBatch(ctx context.Context, batchID uint64) (*bridgeCore.TransferBatch, error)
1515
GetLastExecutedEthBatchID(ctx context.Context) (uint64, error)
16-
GetLastKlvBatchID(ctx context.Context) (uint64, error)
16+
GetLastKcBatchID(ctx context.Context) (uint64, error)
1717
IsMintBurnToken(ctx context.Context, token []byte) (bool, error)
1818
IsNativeToken(ctx context.Context, token []byte) (bool, error)
1919
TotalBalances(ctx context.Context, token []byte) (*big.Int, error)

‎clients/klever/klvClientDataGetter.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,8 +508,8 @@ func (dataGetter *klvClientDataGetter) GetAllKnownTokens(ctx context.Context) ([
508508
return dataGetter.executeQueryFromBuilder(ctx, builder)
509509
}
510510

511-
// GetLastKlvBatchID returns the highest batch ID the safe contract reached. This might be a WIP batch that is not executable yet
512-
func (dataGetter *klvClientDataGetter) GetLastKlvBatchID(ctx context.Context) (uint64, error) {
511+
// GetLastKcBatchID returns the highest batch ID the safe contract reached. This might be a WIP batch that is not executable yet
512+
func (dataGetter *klvClientDataGetter) GetLastKcBatchID(ctx context.Context) (uint64, error) {
513513
builder := dataGetter.createSafeDefaultVmQueryBuilder()
514514
builder.Function(getLastBatchId)
515515

‎clients/klever/klvClientDataGetter_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1539,7 +1539,7 @@ func TestKcClientDataGetter_getBurnBalances(t *testing.T) {
15391539
assert.True(t, proxyCalled)
15401540
}
15411541

1542-
func TestKcClientDataGetter_GetLastKlvBatchID(t *testing.T) {
1542+
func TestKcClientDataGetter_GetLastKcBatchID(t *testing.T) {
15431543
t.Parallel()
15441544

15451545
args := createMockArgsKLVClientDataGetter()
@@ -1566,7 +1566,7 @@ func TestKcClientDataGetter_GetLastKlvBatchID(t *testing.T) {
15661566

15671567
dg, _ := NewKLVClientDataGetter(args)
15681568

1569-
result, err := dg.GetLastKlvBatchID(context.Background())
1569+
result, err := dg.GetLastKcBatchID(context.Background())
15701570
assert.Nil(t, err)
15711571
assert.Equal(t, uint64(3737), result)
15721572
assert.True(t, proxyCalled)

‎docker/scCallsExecutor-docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
dockerfile: scCallsExecutor.Dockerfile
88
restart: unless-stopped
99
volumes:
10-
- "../keys:/klever/keys"
10+
- "../keys:/keys"
1111
# change the `network-address`, `sc-proxy-address` and `private-key-file` accordingly
1212
entrypoint: "./scCallsExecutor \
1313
-log-level *:DEBUG \

‎factory/ethKcBridgeComponents.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ func (components *ethKleverBridgeComponents) createEthereumToKleverBlockchainBri
537537
BalanceValidator: balanceValidator,
538538
MaxQuorumRetriesOnEthereum: args.Configs.GeneralConfig.Eth.MaxRetriesOnQuorumReached,
539539
MaxQuorumRetriesOnKc: args.Configs.GeneralConfig.Klever.MaxRetriesOnQuorumReached,
540-
MaxRestriesOnWasProposed: args.Configs.GeneralConfig.Klever.MaxRetriesOnWasTransferProposed,
540+
MaxRetriesOnWasProposed: args.Configs.GeneralConfig.Klever.MaxRetriesOnWasTransferProposed,
541541
}
542542

543543
bridge, err := ethklever.NewBridgeExecutor(argsBridgeExecutor)
@@ -605,7 +605,7 @@ func (components *ethKleverBridgeComponents) createKcToEthereumBridge(args ArgsE
605605
BalanceValidator: balanceValidator,
606606
MaxQuorumRetriesOnEthereum: args.Configs.GeneralConfig.Eth.MaxRetriesOnQuorumReached,
607607
MaxQuorumRetriesOnKc: args.Configs.GeneralConfig.Klever.MaxRetriesOnQuorumReached,
608-
MaxRestriesOnWasProposed: args.Configs.GeneralConfig.Klever.MaxRetriesOnWasTransferProposed,
608+
MaxRetriesOnWasProposed: args.Configs.GeneralConfig.Klever.MaxRetriesOnWasTransferProposed,
609609
}
610610

611611
bridge, err := ethklever.NewBridgeExecutor(argsBridgeExecutor)

0 commit comments

Comments
 (0)