Skip to content

Commit 92b41b6

Browse files
committed
tapdb: use address.ErrAssetGroupUnknown consistently
We'll want to use the same error being returned in all asset group related database interactions.
1 parent 618dde2 commit 92b41b6

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

tapdb/asset_minting_test.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"github.com/btcsuite/btcd/txscript"
1717
"github.com/btcsuite/btcd/wire"
1818
"github.com/btcsuite/btclog/v2"
19+
"github.com/lightninglabs/taproot-assets/address"
1920
"github.com/lightninglabs/taproot-assets/asset"
2021
"github.com/lightninglabs/taproot-assets/commitment"
2122
"github.com/lightninglabs/taproot-assets/fn"
@@ -1401,7 +1402,9 @@ func TestGroupStore(t *testing.T) {
14011402
fetchInvalidGenID := func(q PendingAssetStore) error {
14021403
dbGroup, err := fetchGroupByGenesis(ctx, q, invalidGenID)
14031404
require.Nil(t, dbGroup)
1404-
require.ErrorContains(t, err, "no matching asset group")
1405+
require.ErrorContains(
1406+
t, err, address.ErrAssetGroupUnknown.Error(),
1407+
)
14051408
return nil
14061409
}
14071410

@@ -1434,7 +1437,9 @@ func TestGroupStore(t *testing.T) {
14341437
fetchInvalidGroupKey := func(q PendingAssetStore) error {
14351438
dbGroup, err := fetchGroupByGroupKey(ctx, q, invalidGroupKey)
14361439
require.Nil(t, dbGroup)
1437-
require.ErrorContains(t, err, "no matching asset group")
1440+
require.ErrorContains(
1441+
t, err, address.ErrAssetGroupUnknown.Error(),
1442+
)
14381443
return nil
14391444
}
14401445

tapdb/assets_common.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/btcsuite/btcd/btcec/v2"
1414
"github.com/btcsuite/btcd/chaincfg/chainhash"
1515
"github.com/btcsuite/btcd/wire"
16+
"github.com/lightninglabs/taproot-assets/address"
1617
"github.com/lightninglabs/taproot-assets/asset"
1718
"github.com/lightninglabs/taproot-assets/fn"
1819
"github.com/lightninglabs/taproot-assets/proof"
@@ -120,9 +121,6 @@ var (
120121
// ErrUpsertScriptKey is returned when upserting a script key fails.
121122
ErrUpsertScriptKey = errors.New("unable to upsert script key")
122123

123-
// ErrNoAssetGroup is returned when no matching asset group is found.
124-
ErrNoAssetGroup = errors.New("no matching asset group")
125-
126124
// ErrNoAssetMeta is returned when no matching asset meta is found.
127125
ErrNoAssetMeta = errors.New("no matching asset meta")
128126

@@ -634,7 +632,7 @@ func fetchGroupByGenesis(ctx context.Context, q GroupStore,
634632
groupInfo, err := q.FetchGroupByGenesis(ctx, genID)
635633
switch {
636634
case errors.Is(err, sql.ErrNoRows):
637-
return nil, fmt.Errorf("%w: %w", ErrNoAssetGroup, err)
635+
return nil, address.ErrAssetGroupUnknown
638636
case err != nil:
639637
return nil, err
640638
}
@@ -669,7 +667,7 @@ func fetchGroupByGroupKey(ctx context.Context, q GroupStore,
669667
groupInfo, err := q.FetchGroupByGroupKey(ctx, groupKeyQuery[:])
670668
switch {
671669
case errors.Is(err, sql.ErrNoRows):
672-
return nil, fmt.Errorf("%w: %w", ErrNoAssetGroup, err)
670+
return nil, address.ErrAssetGroupUnknown
673671
case err != nil:
674672
return nil, err
675673
}

0 commit comments

Comments
 (0)