Skip to content

Commit 37241eb

Browse files
GeorgeTsagkguggero
authored andcommitted
itest: allow nil rfq peer pubkey on asset invoice helpers
1 parent a172f4c commit 37241eb

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

itest/assets_test.go

+19-8
Original file line numberDiff line numberDiff line change
@@ -1660,16 +1660,21 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
16601660

16611661
timeoutSeconds := int64(rfq.DefaultInvoiceExpiry.Seconds())
16621662

1663-
t.Logf("Asking peer %x for quote to buy assets to receive for "+
1664-
"invoice over %d units; waiting up to %ds",
1665-
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1663+
var peerPubKey []byte
1664+
if dstRfqPeer != nil {
1665+
peerPubKey = dstRfqPeer.PubKey[:]
1666+
1667+
t.Logf("Asking peer %x for quote to buy assets to receive for "+
1668+
"invoice over %d units; waiting up to %ds",
1669+
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1670+
}
16661671

16671672
dstTapd := newTapClient(t, dst)
16681673

16691674
request := &tchrpc.AddInvoiceRequest{
16701675
GroupKey: cfg.groupKey,
16711676
AssetAmount: assetAmount,
1672-
PeerPubkey: dstRfqPeer.PubKey[:],
1677+
PeerPubkey: peerPubKey,
16731678
InvoiceRequest: &lnrpc.Invoice{
16741679
Memo: fmt.Sprintf("this is an asset invoice for "+
16751680
"%d units", assetAmount),
@@ -1713,7 +1718,7 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
17131718

17141719
t.Logf("Got quote for %d mSats at %3f msat/unit from peer %x with "+
17151720
"SCID %d", decodedInvoice.NumMsat, mSatPerUnit,
1716-
dstRfqPeer.PubKey[:], resp.AcceptedBuyQuote.Scid)
1721+
resp.AcceptedBuyQuote.Peer, resp.AcceptedBuyQuote.Scid)
17171722

17181723
return resp.InvoiceResult
17191724
}
@@ -1847,9 +1852,15 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
18471852

18481853
timeoutSeconds := int64(rfq.DefaultInvoiceExpiry.Seconds())
18491854

1855+
var rfqPeer []byte
1856+
1857+
if dstRfqPeer != nil {
1858+
rfqPeer = dstRfqPeer.PubKey[:]
1859+
}
1860+
18501861
t.Logf("Asking peer %x for quote to buy assets to receive for "+
18511862
"invoice for %d units; waiting up to %ds",
1852-
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1863+
rfqPeer, assetAmount, timeoutSeconds)
18531864

18541865
dstTapd := newTapClient(t, dst)
18551866

@@ -1862,7 +1873,7 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
18621873
payHash := preimage.Hash()
18631874
request := &tchrpc.AddInvoiceRequest{
18641875
AssetAmount: assetAmount,
1865-
PeerPubkey: dstRfqPeer.PubKey[:],
1876+
PeerPubkey: rfqPeer,
18661877
InvoiceRequest: &lnrpc.Invoice{
18671878
Memo: fmt.Sprintf("this is an asset invoice for "+
18681879
"%d units", assetAmount),
@@ -1900,7 +1911,7 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
19001911
require.EqualValues(t, uint64(numMSats), uint64(decodedInvoice.NumMsat))
19011912

19021913
t.Logf("Got quote for %d msat at %v msat/unit from peer %x with SCID "+
1903-
"%d", decodedInvoice.NumMsat, mSatPerUnit, dstRfqPeer.PubKey[:],
1914+
"%d", decodedInvoice.NumMsat, mSatPerUnit, rfqPeer,
19041915
resp.AcceptedBuyQuote.Scid)
19051916

19061917
return assetHodlInvoice{

0 commit comments

Comments
 (0)