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

Add 'include_leased' flag to ListBalances #1119

Merged
merged 8 commits into from
Sep 23, 2024
Merged

Add 'include_leased' flag to ListBalances #1119

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3cceb71
taprpc: Add 'include_leased' flag to ListBalances
gijswijs Sep 5, 2024
b51eeeb
tapcli: Thread through `include_leased` flag
gijswijs Sep 6, 2024
46f9bb8
tapdb: add managed utxo for random genesis asset
gijswijs Sep 20, 2024
23f0d5b
sqlc: update queries to include `leased` param
gijswijs Sep 6, 2024
a592d8f
tapdb: add `includeLeased` parameter
gijswijs Sep 6, 2024
d9fb682
itest: test balances with and without leased flag
gijswijs Sep 10, 2024
2cae80f
itest: incl. `ListAssets` in `AssertAssetBalances`
gijswijs Sep 18, 2024
fad2631
tapdb: add unit test for balance queries
gijswijs Sep 18, 2024
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
16 changes: 16 additions & 0 deletions itest/assertions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1913,7 +1913,9 @@ func AssertAssetBalances(t *testing.T, client taprpc.TaprootAssetsClient,

require.Equal(t, len(allAssets), len(assetIDBalances.AssetBalances))

var totalBalance uint64
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: shouldn't this commit precede the previous itest: test balances with an without leased flag

for _, balance := range assetIDBalances.AssetBalances {
totalBalance += balance.Balance
for _, rpcAsset := range allAssets {
balanceGen := balance.AssetGenesis
targetGen := rpcAsset.AssetGenesis
Expand All @@ -1932,6 +1934,20 @@ func AssertAssetBalances(t *testing.T, client taprpc.TaprootAssetsClient,
}
}

// We should also ensure that the total balance returned by
// `ListBalances` matches the total balance returned by `ListAssets`.
assetList, err := client.ListAssets(ctxt, &taprpc.ListAssetRequest{
IncludeLeased: includeLeased,
})
require.NoError(t, err)

var totalAssetListBalance uint64
for _, asset := range assetList.Assets {
totalAssetListBalance += asset.Amount
}

require.Equal(t, totalBalance, totalAssetListBalance)

// We'll also ensure that we're able to get the balance by key group
// for all the assets that have one specified.
groupBalanceReq := &taprpc.ListBalancesRequest_GroupKey{
Expand Down