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

Query genesis transactions #4788

Merged
merged 18 commits into from
Aug 1, 2019
Merged

Query genesis transactions #4788

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7d1f580
pausing work until genutils is updated
colin-axner Jul 19, 2019
a8370fd
Merge branch 'master' of github.com:cosmos/cosmos-sdk into colin/3867…
colin-axner Jul 24, 2019
55f424d
update query gen txs rest func
colin-axner Jul 24, 2019
068f2f5
Merge branch 'master' of github.com:cosmos/cosmos-sdk into colin/3867…
colin-axner Jul 24, 2019
b7b092c
Merge branch 'master' of github.com:cosmos/cosmos-sdk into colin/3867…
colin-axner Jul 25, 2019
e242b38
update auth rest handlers
colin-axner Jul 25, 2019
286789d
Implemet supply interface
alexanderbez Jul 31, 2019
10565a5
Merge branch 'master' into colin/3867-query-genesis-transactions
alexanderbez Jul 31, 2019
75781a3
Merge branch 'bez/3867' into colin/3867-query-genesis-transactions
alexanderbez Jul 31, 2019
ed4be97
Update APIs
alexanderbez Jul 31, 2019
6942b38
Add godoc
alexanderbez Jul 31, 2019
c318bb9
fix compiler and amino error
colin-axner Jul 31, 2019
5ffd9f1
update package name
colin-axner Jul 31, 2019
2ac6898
add clog entry
colin-axner Aug 1, 2019
ce53d36
Update .pending/improvements/rest/3867-Allow-querying-
alexanderbez Aug 1, 2019
980e8b3
fix bug
colin-axner Aug 1, 2019
a6d6ff1
reflect pr comments
colin-axner Aug 1, 2019
05dfd99
Merge branch 'colin/3867-query-genesis-transactions' of github.com:co…
colin-axner Aug 1, 2019
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
Update APIs
  • Loading branch information
@alexanderbez
alexanderbez committed Jul 31, 2019
commit ed4be97f6a4afeb030b68b10300213af67f0835d
5 changes: 3 additions & 2 deletions x/supply/internal/keeper/bank.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ func (k Keeper) MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) sdk

// update total supply
supply := k.GetSupply(ctx)
supply.Inflate(amt)
supply = supply.Inflate(amt)

k.SetSupply(ctx, supply)

logger := k.Logger(ctx)
Expand Down Expand Up @@ -135,7 +136,7 @@ func (k Keeper) BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) sdk

// update total supply
supply := k.GetSupply(ctx)
supply.Deflate(amt)
supply = supply.Deflate(amt)
k.SetSupply(ctx, supply)

logger := k.Logger(ctx)
Expand Down
4 changes: 2 additions & 2 deletions x/supply/internal/keeper/bank_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func TestBurnCoins(t *testing.T) {
keeper.SetModuleAccount(ctx, burnerAcc)

initialSupply := keeper.GetSupply(ctx)
initialSupply.Inflate(initCoins)
initialSupply = initialSupply.Inflate(initCoins)
keeper.SetSupply(ctx, initialSupply)

require.Error(t, keeper.BurnCoins(ctx, "", initCoins), "no module account")
Expand All @@ -130,7 +130,7 @@ func TestBurnCoins(t *testing.T) {

// test same functionality on module account with multiple permissions
initialSupply = keeper.GetSupply(ctx)
initialSupply.Inflate(initCoins)
initialSupply = initialSupply.Inflate(initCoins)
keeper.SetSupply(ctx, initialSupply)

require.NoError(t, multiPermAcc.SetCoins(initCoins))
Expand Down