Skip to content

Commit 58adc54

Browse files
committed
itest: allow nil rfq peer pubkey on asset invoice helpers
1 parent ff6446b commit 58adc54

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

16561656
timeoutSeconds := int64(rfq.DefaultInvoiceExpiry.Seconds())
16571657

1658-
t.Logf("Asking peer %x for quote to buy assets to receive for "+
1659-
"invoice over %d units; waiting up to %ds",
1660-
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1658+
var peerPubKey []byte
1659+
if dstRfqPeer != nil {
1660+
peerPubKey = dstRfqPeer.PubKey[:]
1661+
1662+
t.Logf("Asking peer %x for quote to buy assets to receive for "+
1663+
"invoice over %d units; waiting up to %ds",
1664+
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1665+
}
16611666

16621667
dstTapd := newTapClient(t, dst)
16631668

16641669
request := &tchrpc.AddInvoiceRequest{
16651670
GroupKey: cfg.groupKey,
16661671
AssetAmount: assetAmount,
1667-
PeerPubkey: dstRfqPeer.PubKey[:],
1672+
PeerPubkey: peerPubKey,
16681673
InvoiceRequest: &lnrpc.Invoice{
16691674
Memo: fmt.Sprintf("this is an asset invoice for "+
16701675
"%d units", assetAmount),
@@ -1708,7 +1713,7 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
17081713

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

17131718
return resp.InvoiceResult
17141719
}
@@ -1842,9 +1847,15 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
18421847

18431848
timeoutSeconds := int64(rfq.DefaultInvoiceExpiry.Seconds())
18441849

1850+
var rfqPeer []byte
1851+
1852+
if dstRfqPeer != nil {
1853+
rfqPeer = dstRfqPeer.PubKey[:]
1854+
}
1855+
18451856
t.Logf("Asking peer %x for quote to buy assets to receive for "+
18461857
"invoice for %d units; waiting up to %ds",
1847-
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1858+
rfqPeer, assetAmount, timeoutSeconds)
18481859

18491860
dstTapd := newTapClient(t, dst)
18501861

@@ -1857,7 +1868,7 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
18571868
payHash := preimage.Hash()
18581869
request := &tchrpc.AddInvoiceRequest{
18591870
AssetAmount: assetAmount,
1860-
PeerPubkey: dstRfqPeer.PubKey[:],
1871+
PeerPubkey: rfqPeer,
18611872
InvoiceRequest: &lnrpc.Invoice{
18621873
Memo: fmt.Sprintf("this is an asset invoice for "+
18631874
"%d units", assetAmount),
@@ -1895,7 +1906,7 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
18951906
require.EqualValues(t, uint64(numMSats), uint64(decodedInvoice.NumMsat))
18961907

18971908
t.Logf("Got quote for %d msat at %v msat/unit from peer %x with SCID "+
1898-
"%d", decodedInvoice.NumMsat, mSatPerUnit, dstRfqPeer.PubKey[:],
1909+
"%d", decodedInvoice.NumMsat, mSatPerUnit, rfqPeer,
18991910
resp.AcceptedBuyQuote.Scid)
19001911

19011912
return assetHodlInvoice{

0 commit comments

Comments
 (0)