Skip to content

Commit 8ec49c8

Browse files
troiantroian
committed
chore: fix copy paste
Signed-off-by: Artur Troian <troian@users.noreply.github.com>
1 parent 2c2a914 commit 8ec49c8

4 files changed

Lines changed: 54 additions & 50 deletions

File tree

‎testutil/state/suite.go‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
bmetypes "pkg.akt.dev/go/node/bme/v1"
1717
mv1 "pkg.akt.dev/go/node/market/v1"
1818
oracletypes "pkg.akt.dev/go/node/oracle/v1"
19+
"pkg.akt.dev/go/sdkutil"
1920

2021
sdk "github.com/cosmos/cosmos-sdk/types"
2122

@@ -83,41 +84,41 @@ func SetupTestSuiteWithKeepers(t testing.TB, keepers Keepers) *TestSuite {
8384
// to make sure escrow balance values are tracked correctly
8485
bkeeper.
8586
On("SpendableCoin", mock.Anything, mock.Anything, mock.MatchedBy(func(denom string) bool {
86-
matched := denom == "uakt" || denom == "uact"
87+
matched := denom == sdkutil.DenomUakt || denom == sdkutil.DenomUact
8788
return matched
8889
})).
8990
Return(func(_ context.Context, _ sdk.AccAddress, denom string) sdk.Coin {
90-
if denom == "uakt" {
91-
return sdk.NewInt64Coin("uakt", 10000000)
91+
if denom == sdkutil.DenomUakt {
92+
return sdk.NewInt64Coin(sdkutil.DenomUakt, 10000000)
9293
}
9394
return sdk.NewInt64Coin("uact", 1800000)
9495
})
9596

9697
// Mock GetSupply for BME collateral ratio checks
9798
bkeeper.
9899
On("GetSupply", mock.Anything, mock.MatchedBy(func(denom string) bool {
99-
return denom == "uakt" || denom == "uact"
100+
return denom == sdkutil.DenomUakt || denom == sdkutil.DenomUact
100101
})).
101102
Return(func(ctx context.Context, denom string) sdk.Coin {
102-
if denom == "uakt" {
103-
return sdk.NewInt64Coin("uakt", 1000000000000) // 1T uakt total supply
103+
if denom == sdkutil.DenomUakt {
104+
return sdk.NewInt64Coin(sdkutil.DenomUakt, 1000000000000) // 1T uakt total supply
104105
}
105106
// For CR calculation: CR = (BME_uakt_balance * swap_rate) / total_uact_supply
106107
// Target CR > 100% for tests: (600B * 3.0) / 1.8T = 1800B / 1800B = 1.0 = 100%
107-
return sdk.NewInt64Coin("uact", 1800000000000) // 1.8T uact total supply
108+
return sdk.NewInt64Coin(sdkutil.DenomUact, 1800000000000) // 1.8T uact total supply
108109
})
109110

110111
// Mock GetBalance for BME module account balance checks
111112
bkeeper.
112113
On("GetBalance", mock.Anything, mock.Anything, mock.MatchedBy(func(denom string) bool {
113-
return denom == "uakt" || denom == "uact"
114+
return denom == sdkutil.DenomUakt || denom == sdkutil.DenomUact
114115
})).
115116
Return(func(ctx context.Context, addr sdk.AccAddress, denom string) sdk.Coin {
116-
if denom == "uakt" {
117+
if denom == sdkutil.DenomUakt {
117118
// BME module should have enough uakt to maintain healthy CR
118-
return sdk.NewInt64Coin("uakt", 600000000000) // 600B uakt in BME module
119+
return sdk.NewInt64Coin(sdkutil.DenomUakt, 600000000000) // 600B uakt in BME module
119120
}
120-
return sdk.NewInt64Coin("uact", 100000000000) // 100B uact in BME module
121+
return sdk.NewInt64Coin(sdkutil.DenomUact, 100000000000) // 100B uact in BME module
121122
})
122123

123124
keepers.Bank = bkeeper

‎x/bme/keeper/codec.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ func (d ledgerRecordIDCodec) Encode(buffer []byte, key types.LedgerRecordID) (in
9090

9191
offset += copy(buffer[offset:], data)
9292

93-
binary.BigEndian.PutUint64(buffer[offset:], uint64(key.Height))
93+
binary.BigEndian.PutUint64(buffer[offset:], uint64(key.Height)) //nolint: gosec
9494
offset += 8
9595

96-
binary.BigEndian.PutUint64(buffer[offset:], uint64(key.Sequence))
96+
binary.BigEndian.PutUint64(buffer[offset:], uint64(key.Sequence)) //nolint: gosec
9797
offset += 8
9898

9999
return offset, nil

‎x/deployment/handler/handler_test.go‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"github.com/stretchr/testify/mock"
1212
"github.com/stretchr/testify/require"
1313
mv1 "pkg.akt.dev/go/node/market/v1"
14+
"pkg.akt.dev/go/sdkutil"
1415

1516
sdkmath "cosmossdk.io/math"
1617
"github.com/cosmos/cosmos-sdk/baseapp"
@@ -29,6 +30,7 @@ import (
2930

3031
cmocks "pkg.akt.dev/node/v2/testutil/cosmos/mocks"
3132
"pkg.akt.dev/node/v2/testutil/state"
33+
bmemodule "pkg.akt.dev/node/v2/x/bme"
3234
"pkg.akt.dev/node/v2/x/deployment/handler"
3335
"pkg.akt.dev/node/v2/x/deployment/keeper"
3436
ehandler "pkg.akt.dev/node/v2/x/escrow/handler"
@@ -51,7 +53,7 @@ type testSuite struct {
5153
}
5254

5355
func setupTestSuite(t *testing.T) *testSuite {
54-
defaultDeposit, err := dvbeta.DefaultParams().MinDepositFor("uact")
56+
defaultDeposit, err := dvbeta.DefaultParams().MinDepositFor(sdkutil.DenomUact)
5557
require.NoError(t, err)
5658

5759
owner := testutil.AccAddress(t)
@@ -113,60 +115,60 @@ func setupTestSuite(t *testing.T) *testSuite {
113115

114116
bankKeeper.
115117
On("SpendableCoin", mock.Anything, mock.Anything, mock.MatchedBy(func(denom string) bool {
116-
matched := denom == "uakt" || denom == "uact"
118+
matched := denom == sdkutil.DenomUakt || denom == sdkutil.DenomUact
117119
return matched
118120
})).
119121
Return(func(_ context.Context, _ sdk.AccAddress, denom string) sdk.Coin {
120-
if denom == "uakt" {
121-
return sdk.NewInt64Coin("uakt", 10000000)
122+
if denom == sdkutil.DenomUakt {
123+
return sdk.NewInt64Coin(sdkutil.DenomUakt, 10000000)
122124
}
123-
return sdk.NewInt64Coin("uact", 1800000)
125+
return sdk.NewInt64Coin(sdkutil.DenomUact, 1800000)
124126
})
125127

126128
// Mock GetSupply for BME collateral ratio checks
127129
bankKeeper.
128130
On("GetSupply", mock.Anything, mock.MatchedBy(func(denom string) bool {
129-
return denom == "uakt" || denom == "uact"
131+
return denom == sdkutil.DenomUakt || denom == sdkutil.DenomUact
130132
})).
131133
Return(func(ctx context.Context, denom string) sdk.Coin {
132-
if denom == "uakt" {
133-
return sdk.NewInt64Coin("uakt", 1000000000000) // 1T uakt total supply
134+
if denom == sdkutil.DenomUakt {
135+
return sdk.NewInt64Coin(sdkutil.DenomUakt, 1000000000000) // 1T uakt total supply
134136
}
135137
// For CR calculation: CR = (BME_uakt_balance * swap_rate) / total_uact_supply
136138
// Target CR > 100% for tests: (600B * 3.0) / 1.8T = 1800B / 1800B = 1.0 = 100%
137-
return sdk.NewInt64Coin("uact", 1800000000000) // 1.8T uact total supply
139+
return sdk.NewInt64Coin(sdkutil.DenomUact, 1800000000000) // 1.8T uact total supply
138140
})
139141

140142
// Mock GetBalance for BME module account balance checks
141143
bankKeeper.
142144
On("GetBalance", mock.Anything, mock.Anything, mock.MatchedBy(func(denom string) bool {
143-
return denom == "uakt" || denom == "uact"
145+
return denom == sdkutil.DenomUakt || denom == sdkutil.DenomUact
144146
})).
145147
Return(func(ctx context.Context, addr sdk.AccAddress, denom string) sdk.Coin {
146-
if denom == "uakt" {
148+
if denom == sdkutil.DenomUakt {
147149
// BME module should have enough uakt to maintain healthy CR
148-
return sdk.NewInt64Coin("uakt", 600000000000) // 600B uakt in BME module
150+
return sdk.NewInt64Coin(sdkutil.DenomUakt, 600000000000) // 600B uakt in BME module
149151
}
150-
return sdk.NewInt64Coin("uact", 100000000000) // 100B uact in BME module
152+
return sdk.NewInt64Coin(sdkutil.DenomUact, 100000000000) // 100B uact in BME module
151153
})
152154

153155
// Mock SendCoinsFromAccountToModule for BME burn/mint operations
154156
bankKeeper.
155-
On("SendCoinsFromAccountToModule", mock.Anything, mock.Anything, "bme", mock.Anything).
157+
On("SendCoinsFromAccountToModule", mock.Anything, mock.Anything, bmemodule.ModuleName, mock.Anything).
156158
Return(nil)
157159

158160
bankKeeper.
159-
On("SendCoinsFromAccountToModule", mock.Anything, mock.Anything, "escrow", mock.Anything).
161+
On("SendCoinsFromAccountToModule", mock.Anything, mock.Anything, emodule.ModuleName, mock.Anything).
160162
Return(nil)
161163

162164
// Mock MintCoins for BME mint operations
163165
bankKeeper.
164-
On("MintCoins", mock.Anything, "bme", mock.Anything).
166+
On("MintCoins", mock.Anything, bmemodule.ModuleName, mock.Anything).
165167
Return(nil)
166168

167169
// Mock BurnCoins for BME burn operations
168170
bankKeeper.
169-
On("BurnCoins", mock.Anything, "bme", mock.Anything).
171+
On("BurnCoins", mock.Anything, bmemodule.ModuleName, mock.Anything).
170172
Return(nil)
171173

172174
// Mock SendCoinsFromModuleToAccount for both BME and escrow operations

‎x/escrow/keeper/keeper_test.go‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"pkg.akt.dev/go/testutil"
1616

1717
"pkg.akt.dev/node/v2/testutil/state"
18+
bmemodule "pkg.akt.dev/node/v2/x/bme"
1819
)
1920

2021
type kTestSuite struct {
@@ -69,13 +70,13 @@ func Test_AccountSettlement(t *testing.T) {
6970
}), mock.Anything).
7071
Return(nil).Maybe()
7172
bkeeper.
72-
On("SendCoinsFromModuleToModule", mock.Anything, "bme", mock.Anything, mock.Anything).
73+
On("SendCoinsFromModuleToModule", mock.Anything, bmemodule.ModuleName, mock.Anything, mock.Anything).
7374
Return(nil).Maybe()
7475
bkeeper.
75-
On("MintCoins", mock.Anything, "bme", mock.Anything).
76+
On("MintCoins", mock.Anything, bmemodule.ModuleName, mock.Anything).
7677
Return(nil).Maybe()
7778
bkeeper.
78-
On("BurnCoins", mock.Anything, "bme", mock.Anything).
79+
On("BurnCoins", mock.Anything, bmemodule.ModuleName, mock.Anything).
7980
Return(nil).Maybe()
8081
bkeeper.
8182
On("SendCoinsFromModuleToAccount", mock.Anything, mock.Anything, mock.Anything, mock.Anything).
@@ -129,16 +130,16 @@ func Test_AccountCreate(t *testing.T) {
129130
// Mock BME withdrawal flow for each deposit
130131
// BME handles the conversion, use flexible matchers since decimal rounding may occur
131132
bkeeper.
132-
On("SendCoinsFromModuleToModule", mock.Anything, module.ModuleName, "bme", mock.Anything).
133+
On("SendCoinsFromModuleToModule", mock.Anything, module.ModuleName, bmemodule.ModuleName, mock.Anything).
133134
Return(nil).Maybe()
134135
bkeeper.
135-
On("MintCoins", mock.Anything, "bme", mock.Anything).
136+
On("MintCoins", mock.Anything, bmemodule.ModuleName, mock.Anything).
136137
Return(nil).Maybe()
137138
bkeeper.
138-
On("BurnCoins", mock.Anything, "bme", mock.Anything).
139+
On("BurnCoins", mock.Anything, bmemodule.ModuleName, mock.Anything).
139140
Return(nil).Maybe()
140141
bkeeper.
141-
On("SendCoinsFromModuleToAccount", mock.Anything, "escrow", owner, mock.Anything).
142+
On("SendCoinsFromModuleToAccount", mock.Anything, module.ModuleName, owner, mock.Anything).
142143
Return(nil).Maybe()
143144

144145
assert.NoError(t, ekeeper.AccountClose(ctx, id))
@@ -202,16 +203,16 @@ func Test_PaymentCreate(t *testing.T) {
202203
ctx = ctx.WithBlockHeight(ctx.BlockHeight() + blkdelta)
203204
// Mock BME operations for payment withdrawal
204205
bkeeper.
205-
On("SendCoinsFromModuleToModule", mock.Anything, module.ModuleName, "bme", mock.Anything).
206+
On("SendCoinsFromModuleToModule", mock.Anything, module.ModuleName, bmemodule.ModuleName, mock.Anything).
206207
Return(nil).Maybe()
207208
bkeeper.
208-
On("SendCoinsFromModuleToModule", mock.Anything, "bme", mock.Anything, mock.Anything).
209+
On("SendCoinsFromModuleToModule", mock.Anything, bmemodule.ModuleName, mock.Anything, mock.Anything).
209210
Return(nil).Maybe()
210211
bkeeper.
211-
On("MintCoins", mock.Anything, "bme", mock.Anything).
212+
On("MintCoins", mock.Anything, bmemodule.ModuleName, mock.Anything).
212213
Return(nil).Maybe()
213214
bkeeper.
214-
On("BurnCoins", mock.Anything, "bme", mock.Anything).
215+
On("BurnCoins", mock.Anything, bmemodule.ModuleName, mock.Anything).
215216
Return(nil).Maybe()
216217
bkeeper.
217218
On("SendCoinsFromModuleToAccount", mock.Anything, mock.Anything, powner, mock.Anything).
@@ -243,7 +244,7 @@ func Test_PaymentCreate(t *testing.T) {
243244
ctx = ctx.WithBlockHeight(ctx.BlockHeight() + blkdelta)
244245
bkeeper.
245246
On("SendCoinsFromModuleToModule", mock.Anything, module.ModuleName, mock.MatchedBy(func(dest string) bool {
246-
return dest == "bme" || dest == distrtypes.ModuleName
247+
return dest == bmemodule.ModuleName || dest == distrtypes.ModuleName
247248
}), mock.Anything).
248249
Return(nil).Maybe()
249250
assert.NoError(t, ekeeper.PaymentClose(ctx, pid))
@@ -294,17 +295,17 @@ func Test_Overdraft(t *testing.T) {
294295
// Setup BME mocks for withdrawal and settlement operations BEFORE AccountCreate
295296
bkeeper.
296297
On("SendCoinsFromModuleToModule", mock.Anything, module.ModuleName, mock.MatchedBy(func(dest string) bool {
297-
return dest == "bme" || dest == distrtypes.ModuleName
298+
return dest == bmemodule.ModuleName || dest == distrtypes.ModuleName
298299
}), mock.Anything).
299300
Return(nil).Maybe()
300301
bkeeper.
301-
On("SendCoinsFromModuleToModule", mock.Anything, "bme", mock.Anything, mock.Anything).
302+
On("SendCoinsFromModuleToModule", mock.Anything, bmemodule.ModuleName, mock.Anything, mock.Anything).
302303
Return(nil).Maybe()
303304
bkeeper.
304-
On("MintCoins", mock.Anything, "bme", mock.Anything).
305+
On("MintCoins", mock.Anything, bmemodule.ModuleName, mock.Anything).
305306
Return(nil).Maybe()
306307
bkeeper.
307-
On("BurnCoins", mock.Anything, "bme", mock.Anything).
308+
On("BurnCoins", mock.Anything, bmemodule.ModuleName, mock.Anything).
308309
Return(nil).Maybe()
309310
bkeeper.
310311
On("SendCoinsFromModuleToAccount", mock.Anything, mock.Anything, mock.Anything, mock.Anything).
@@ -332,17 +333,17 @@ func Test_Overdraft(t *testing.T) {
332333
// Mock BME operations for withdrawal
333334
bkeeper.
334335
On("SendCoinsFromModuleToModule", mock.Anything, module.ModuleName, mock.MatchedBy(func(dest string) bool {
335-
return dest == "bme" || dest == distrtypes.ModuleName
336+
return dest == bmemodule.ModuleName || dest == distrtypes.ModuleName
336337
}), mock.Anything).
337338
Return(nil).Maybe()
338339
bkeeper.
339-
On("SendCoinsFromModuleToModule", mock.Anything, "bme", mock.Anything, mock.Anything).
340+
On("SendCoinsFromModuleToModule", mock.Anything, bmemodule.ModuleName, mock.Anything, mock.Anything).
340341
Return(nil).Maybe()
341342
bkeeper.
342-
On("MintCoins", mock.Anything, "bme", mock.Anything).
343+
On("MintCoins", mock.Anything, bmemodule.ModuleName, mock.Anything).
343344
Return(nil).Maybe()
344345
bkeeper.
345-
On("BurnCoins", mock.Anything, "bme", mock.Anything).
346+
On("BurnCoins", mock.Anything, bmemodule.ModuleName, mock.Anything).
346347
Return(nil).Maybe()
347348
bkeeper.
348349
On("SendCoinsFromModuleToAccount", mock.Anything, mock.Anything, mock.Anything, mock.Anything).

0 commit comments

Comments
 (0)