Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: sdk.Coins.Add #14715

Merged
merged 11 commits into from
Jan 26, 2023
Merged

fix: sdk.Coins.Add #14715

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5c36fb1
fix: Coins.Add + tests
robert-zaremba Jan 20, 2023
4e5facf
adding Coins.Sub tests
robert-zaremba Jan 20, 2023
d7d49b8
Merge branch 'main' into robert/fix-coins
robert-zaremba Jan 20, 2023
bee25bc
gofumpt
robert-zaremba Jan 20, 2023
f5997a0
review
robert-zaremba Jan 23, 2023
695e688
Merge remote-tracking branch 'origin/main' into robert/fix-coins
robert-zaremba Jan 23, 2023
3e41b05
fix tests
robert-zaremba Jan 23, 2023
09d4b7a
fix feegrant tests
robert-zaremba Jan 23, 2023
e8f7c5b
fix send_authorization
robert-zaremba Jan 26, 2023
f7e9486
Merge branch 'main' into robert/fix-coins
robert-zaremba Jan 26, 2023
d48232f
add changelog
julienrbrt Jan 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix feegrant tests
  • Loading branch information
@robert-zaremba
robert-zaremba committed Jan 23, 2023
commit 09d4b7a2d9242660c717cae1f7bc42b15e9a73a8
29 changes: 16 additions & 13 deletions x/feegrant/periodic_fee_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func TestPeriodicFeeValidAllow(t *testing.T) {
leftAtom := sdk.NewCoins(sdk.NewInt64Coin("atom", 512))
oneAtom := sdk.NewCoins(sdk.NewInt64Coin("atom", 1))
eth := sdk.NewCoins(sdk.NewInt64Coin("eth", 1))
emptyCoins := sdk.Coins{}

now := ctx.BlockTime()
oneHour := now.Add(1 * time.Hour)
Expand Down Expand Up @@ -61,11 +62,12 @@ func TestPeriodicFeeValidAllow(t *testing.T) {
PeriodSpendLimit: smallAtom,
PeriodReset: now.Add(30 * time.Minute),
},
blockTime: now,
valid: true,
accept: true,
remove: false,
periodReset: now.Add(30 * time.Minute),
blockTime: now,
valid: true,
accept: true,
remove: false,
remainsPeriod: emptyCoins,
periodReset: now.Add(30 * time.Minute),
},
"mismatched currencies": {
allow: feegrant.PeriodicAllowance{
Expand Down Expand Up @@ -94,7 +96,7 @@ func TestPeriodicFeeValidAllow(t *testing.T) {
blockTime: now,
accept: true,
remove: false,
remainsPeriod: nil,
remainsPeriod: emptyCoins,
remains: leftAtom,
periodReset: now.Add(1 * time.Hour),
},
Expand All @@ -113,7 +115,7 @@ func TestPeriodicFeeValidAllow(t *testing.T) {
blockTime: now.Add(1 * time.Hour),
accept: true,
remove: false,
remainsPeriod: nil,
remainsPeriod: emptyCoins,
remains: smallAtom,
periodReset: oneHour.Add(tenMinutes), // one step from last reset, not now
},
Expand Down Expand Up @@ -142,12 +144,13 @@ func TestPeriodicFeeValidAllow(t *testing.T) {
PeriodReset: now,
PeriodSpendLimit: atom,
},
valid: true,
fee: atom,
blockTime: oneHour,
accept: true,
remove: false,
periodReset: oneHour.Add(tenMinutes), // one step from last reset, not now
valid: true,
fee: atom,
blockTime: oneHour,
accept: true,
remove: false,
remainsPeriod: emptyCoins,
periodReset: oneHour.Add(tenMinutes), // one step from last reset, not now
},
"expired": {
allow: feegrant.PeriodicAllowance{
Expand Down