Skip to content

Commit 69205e3

Browse files
committed
itest: allow nil rfq peer pubkey on asset invoice helpers
1 parent d79048b commit 69205e3

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

itest/assets_test.go

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1760,16 +1760,21 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
17601760

17611761
timeoutSeconds := int64(rfq.DefaultInvoiceExpiry.Seconds())
17621762

1763-
t.Logf("Asking peer %x for quote to buy assets to receive for "+
1764-
"invoice over %d units; waiting up to %ds",
1765-
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1763+
var peerPubKey []byte
1764+
if dstRfqPeer != nil {
1765+
peerPubKey = dstRfqPeer.PubKey[:]
1766+
1767+
t.Logf("Asking peer %x for quote to buy assets to receive for "+
1768+
"invoice over %d units; waiting up to %ds",
1769+
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1770+
}
17661771

17671772
dstTapd := newTapClient(t, dst)
17681773

17691774
request := &tchrpc.AddInvoiceRequest{
17701775
GroupKey: cfg.groupKey,
17711776
AssetAmount: assetAmount,
1772-
PeerPubkey: dstRfqPeer.PubKey[:],
1777+
PeerPubkey: peerPubKey,
17731778
InvoiceRequest: &lnrpc.Invoice{
17741779
Memo: fmt.Sprintf("this is an asset invoice for "+
17751780
"%d units", assetAmount),
@@ -1824,7 +1829,7 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
18241829

18251830
t.Logf("Got quote for %d mSats at %3f msat/unit from peer %x with "+
18261831
"SCID %d", decodedInvoice.NumMsat, mSatPerUnit,
1827-
dstRfqPeer.PubKey[:], resp.AcceptedBuyQuote.Scid)
1832+
resp.AcceptedBuyQuote.Peer, resp.AcceptedBuyQuote.Scid)
18281833

18291834
return resp.InvoiceResult
18301835
}
@@ -1958,9 +1963,15 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
19581963

19591964
timeoutSeconds := int64(rfq.DefaultInvoiceExpiry.Seconds())
19601965

1966+
var rfqPeer []byte
1967+
1968+
if dstRfqPeer != nil {
1969+
rfqPeer = dstRfqPeer.PubKey[:]
1970+
}
1971+
19611972
t.Logf("Asking peer %x for quote to buy assets to receive for "+
19621973
"invoice for %d units; waiting up to %ds",
1963-
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1974+
rfqPeer, assetAmount, timeoutSeconds)
19641975

19651976
dstTapd := newTapClient(t, dst)
19661977

@@ -1973,7 +1984,7 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
19731984
payHash := preimage.Hash()
19741985
request := &tchrpc.AddInvoiceRequest{
19751986
AssetAmount: assetAmount,
1976-
PeerPubkey: dstRfqPeer.PubKey[:],
1987+
PeerPubkey: rfqPeer,
19771988
InvoiceRequest: &lnrpc.Invoice{
19781989
Memo: fmt.Sprintf("this is an asset invoice for "+
19791990
"%d units", assetAmount),
@@ -2011,7 +2022,7 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
20112022
require.EqualValues(t, uint64(numMSats), uint64(decodedInvoice.NumMsat))
20122023

20132024
t.Logf("Got quote for %d msat at %v msat/unit from peer %x with SCID "+
2014-
"%d", decodedInvoice.NumMsat, mSatPerUnit, dstRfqPeer.PubKey[:],
2025+
"%d", decodedInvoice.NumMsat, mSatPerUnit, rfqPeer,
20152026
resp.AcceptedBuyQuote.Scid)
20162027

20172028
return assetHodlInvoice{

0 commit comments

Comments
 (0)