Skip to content

Commit 322f818

Browse files
committed
mod: bump to latest version of tapd
1 parent 7af5f68 commit 322f818

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/lightninglabs/pool v0.6.5-beta.0.20250305125211-4e860ec4e77f
2929
github.com/lightninglabs/pool/auctioneerrpc v1.1.3-0.20250305125211-4e860ec4e77f
3030
github.com/lightninglabs/pool/poolrpc v1.0.1-0.20250305125211-4e860ec4e77f
31-
github.com/lightninglabs/taproot-assets v0.5.2-0.20250401150538-a9ea76a9ed3c
31+
github.com/lightninglabs/taproot-assets v0.5.2-0.20250415163253-1dd4f02b6cef
3232
github.com/lightningnetwork/lnd v0.19.0-beta.rc1.0.20250327183348-eb822a5e117f
3333
github.com/lightningnetwork/lnd/cert v1.2.2
3434
github.com/lightningnetwork/lnd/clock v1.1.1

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1181,8 +1181,8 @@ github.com/lightninglabs/pool/poolrpc v1.0.1-0.20250305125211-4e860ec4e77f h1:5p
11811181
github.com/lightninglabs/pool/poolrpc v1.0.1-0.20250305125211-4e860ec4e77f/go.mod h1:lGs2hSVZ+GFpdv3btaIl9icG5/gz7BBRfvmD2iqqNl0=
11821182
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display h1:w7FM5LH9Z6CpKxl13mS48idsu6F+cEZf0lkyiV+Dq9g=
11831183
github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
1184-
github.com/lightninglabs/taproot-assets v0.5.2-0.20250401150538-a9ea76a9ed3c h1:Rebx5DVZx3u327vKRrueFjZNlei1RzdGzFmOZmenkiQ=
1185-
github.com/lightninglabs/taproot-assets v0.5.2-0.20250401150538-a9ea76a9ed3c/go.mod h1:e3SjXbbi4xKhOzq54c672Z/j9UTRq5DLJGx/URgVTJo=
1184+
github.com/lightninglabs/taproot-assets v0.5.2-0.20250415163253-1dd4f02b6cef h1:2uwFNdTp+pshOEkESKONPae8r+CD1RsExgOZyyLSOZA=
1185+
github.com/lightninglabs/taproot-assets v0.5.2-0.20250415163253-1dd4f02b6cef/go.mod h1:e3SjXbbi4xKhOzq54c672Z/j9UTRq5DLJGx/URgVTJo=
11861186
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
11871187
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
11881188
github.com/lightningnetwork/lnd v0.19.0-beta.rc1.0.20250327183348-eb822a5e117f h1:+Bejv2Ij/ryUjLacBd5au0acMH0AYs0lhb7ki5rx9ms=

itest/assets_test.go

+10-8
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,8 @@ func syncUniverses(t *testing.T, universe *tapClient, nodes ...*HarnessNode) {
390390
func assertUniverseProofExists(t *testing.T, universe *tapClient,
391391
assetID, groupKey, scriptKey []byte, outpoint string) *taprpc.Asset {
392392

393-
t.Logf("Asserting proof outpoint=%v, script_key=%x", outpoint,
394-
scriptKey)
393+
t.Logf("Asserting proof outpoint=%v, script_key=%x, asset_id=%x, "+
394+
"group_key=%x", outpoint, scriptKey, assetID, groupKey)
395395

396396
req := &universerpc.UniverseKey{
397397
Id: &universerpc.ID{
@@ -517,15 +517,15 @@ func haveFundingAsset(assetChannel *rfqmsg.JsonAssetChannel,
517517
}
518518

519519
func assertAssetChan(t *testing.T, src, dst *HarnessNode, fundingAmount uint64,
520-
mintedAsset *taprpc.Asset) {
520+
channelAsset *taprpc.Asset) {
521521

522522
err := wait.NoError(func() error {
523523
a, err := getChannelCustomData(src, dst)
524524
if err != nil {
525525
return err
526526
}
527527

528-
assetID := mintedAsset.AssetGenesis.AssetId
528+
assetID := channelAsset.AssetGenesis.AssetId
529529
if !haveFundingAsset(a, assetID) {
530530
return fmt.Errorf("expected asset ID %x, to "+
531531
"be in channel", assetID)
@@ -538,10 +538,12 @@ func assertAssetChan(t *testing.T, src, dst *HarnessNode, fundingAmount uint64,
538538

539539
// Check the decimal display of the channel funding blob. If no
540540
// explicit value was set, we assume and expect the value of 0.
541+
// We only need to check the first funding asset, since we
542+
// enforce them to be the same.
541543
var expectedDecimalDisplay uint8
542-
if mintedAsset.DecimalDisplay != nil {
544+
if channelAsset.DecimalDisplay != nil {
543545
expectedDecimalDisplay = uint8(
544-
mintedAsset.DecimalDisplay.DecimalDisplay,
546+
channelAsset.DecimalDisplay.DecimalDisplay,
545547
)
546548
}
547549

@@ -629,8 +631,8 @@ func getChannelCustomData(src, dst *HarnessNode) (*rfqmsg.JsonAssetChannel,
629631
err)
630632
}
631633

632-
if len(assetData.FundingAssets) != 1 {
633-
return nil, fmt.Errorf("expected 1 asset, got %d",
634+
if len(assetData.FundingAssets) == 0 {
635+
return nil, fmt.Errorf("expected at least 1 asset, got %d",
634636
len(assetData.FundingAssets))
635637
}
636638

0 commit comments

Comments
 (0)