Skip to content

Commit 3d9834d

Browse files
committed
itest: allow nil rfq peer pubkey on asset invoice helpers
1 parent 3e26bd2 commit 3d9834d

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
@@ -1783,16 +1783,21 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
17831783

17841784
timeoutSeconds := int64(rfq.DefaultInvoiceExpiry.Seconds())
17851785

1786-
t.Logf("Asking peer %x for quote to buy assets to receive for "+
1787-
"invoice over %d units; waiting up to %ds",
1788-
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1786+
var peerPubKey []byte
1787+
if dstRfqPeer != nil {
1788+
peerPubKey = dstRfqPeer.PubKey[:]
1789+
1790+
t.Logf("Asking peer %x for quote to buy assets to receive for "+
1791+
"invoice over %d units; waiting up to %ds",
1792+
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1793+
}
17891794

17901795
dstTapd := newTapClient(t, dst)
17911796

17921797
request := &tchrpc.AddInvoiceRequest{
17931798
GroupKey: cfg.groupKey,
17941799
AssetAmount: assetAmount,
1795-
PeerPubkey: dstRfqPeer.PubKey[:],
1800+
PeerPubkey: peerPubKey,
17961801
InvoiceRequest: &lnrpc.Invoice{
17971802
Memo: fmt.Sprintf("this is an asset invoice for "+
17981803
"%d units", assetAmount),
@@ -1847,7 +1852,7 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
18471852

18481853
t.Logf("Got quote for %d mSats at %3f msat/unit from peer %x with "+
18491854
"SCID %d", decodedInvoice.NumMsat, mSatPerUnit,
1850-
dstRfqPeer.PubKey[:], resp.AcceptedBuyQuote.Scid)
1855+
resp.AcceptedBuyQuote.Peer, resp.AcceptedBuyQuote.Scid)
18511856

18521857
return resp.InvoiceResult
18531858
}
@@ -1981,9 +1986,15 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
19811986

19821987
timeoutSeconds := int64(rfq.DefaultInvoiceExpiry.Seconds())
19831988

1989+
var rfqPeer []byte
1990+
1991+
if dstRfqPeer != nil {
1992+
rfqPeer = dstRfqPeer.PubKey[:]
1993+
}
1994+
19841995
t.Logf("Asking peer %x for quote to buy assets to receive for "+
19851996
"invoice for %d units; waiting up to %ds",
1986-
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1997+
rfqPeer, assetAmount, timeoutSeconds)
19871998

19881999
dstTapd := newTapClient(t, dst)
19892000

@@ -1996,7 +2007,7 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
19962007
payHash := preimage.Hash()
19972008
request := &tchrpc.AddInvoiceRequest{
19982009
AssetAmount: assetAmount,
1999-
PeerPubkey: dstRfqPeer.PubKey[:],
2010+
PeerPubkey: rfqPeer,
20002011
InvoiceRequest: &lnrpc.Invoice{
20012012
Memo: fmt.Sprintf("this is an asset invoice for "+
20022013
"%d units", assetAmount),
@@ -2034,7 +2045,7 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
20342045
require.EqualValues(t, uint64(numMSats), uint64(decodedInvoice.NumMsat))
20352046

20362047
t.Logf("Got quote for %d msat at %v msat/unit from peer %x with SCID "+
2037-
"%d", decodedInvoice.NumMsat, mSatPerUnit, dstRfqPeer.PubKey[:],
2048+
"%d", decodedInvoice.NumMsat, mSatPerUnit, rfqPeer,
20382049
resp.AcceptedBuyQuote.Scid)
20392050

20402051
return assetHodlInvoice{

0 commit comments

Comments
 (0)