Skip to content

Commit 73a73ba

Browse files
committed
itest: allow nil rfq peer pubkey on asset invoice helpers
1 parent 74d8b4b commit 73a73ba

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

17331733
timeoutSeconds := int64(rfq.DefaultInvoiceExpiry.Seconds())
17341734

1735-
t.Logf("Asking peer %x for quote to buy assets to receive for "+
1736-
"invoice over %d units; waiting up to %ds",
1737-
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1735+
var peerPubKey []byte
1736+
if dstRfqPeer != nil {
1737+
peerPubKey = dstRfqPeer.PubKey[:]
1738+
1739+
t.Logf("Asking peer %x for quote to buy assets to receive for "+
1740+
"invoice over %d units; waiting up to %ds",
1741+
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1742+
}
17381743

17391744
dstTapd := newTapClient(t, dst)
17401745

17411746
request := &tchrpc.AddInvoiceRequest{
17421747
GroupKey: cfg.groupKey,
17431748
AssetAmount: assetAmount,
1744-
PeerPubkey: dstRfqPeer.PubKey[:],
1749+
PeerPubkey: peerPubKey,
17451750
InvoiceRequest: &lnrpc.Invoice{
17461751
Memo: fmt.Sprintf("this is an asset invoice for "+
17471752
"%d units", assetAmount),
@@ -1796,7 +1801,7 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
17961801

17971802
t.Logf("Got quote for %d mSats at %3f msat/unit from peer %x with "+
17981803
"SCID %d", decodedInvoice.NumMsat, mSatPerUnit,
1799-
dstRfqPeer.PubKey[:], resp.AcceptedBuyQuote.Scid)
1804+
resp.AcceptedBuyQuote.Peer, resp.AcceptedBuyQuote.Scid)
18001805

18011806
return resp.InvoiceResult
18021807
}
@@ -1930,9 +1935,15 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
19301935

19311936
timeoutSeconds := int64(rfq.DefaultInvoiceExpiry.Seconds())
19321937

1938+
var rfqPeer []byte
1939+
1940+
if dstRfqPeer != nil {
1941+
rfqPeer = dstRfqPeer.PubKey[:]
1942+
}
1943+
19331944
t.Logf("Asking peer %x for quote to buy assets to receive for "+
19341945
"invoice for %d units; waiting up to %ds",
1935-
dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
1946+
rfqPeer, assetAmount, timeoutSeconds)
19361947

19371948
dstTapd := newTapClient(t, dst)
19381949

@@ -1945,7 +1956,7 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
19451956
payHash := preimage.Hash()
19461957
request := &tchrpc.AddInvoiceRequest{
19471958
AssetAmount: assetAmount,
1948-
PeerPubkey: dstRfqPeer.PubKey[:],
1959+
PeerPubkey: rfqPeer,
19491960
InvoiceRequest: &lnrpc.Invoice{
19501961
Memo: fmt.Sprintf("this is an asset invoice for "+
19511962
"%d units", assetAmount),
@@ -1983,7 +1994,7 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
19831994
require.EqualValues(t, uint64(numMSats), uint64(decodedInvoice.NumMsat))
19841995

19851996
t.Logf("Got quote for %d msat at %v msat/unit from peer %x with SCID "+
1986-
"%d", decodedInvoice.NumMsat, mSatPerUnit, dstRfqPeer.PubKey[:],
1997+
"%d", decodedInvoice.NumMsat, mSatPerUnit, rfqPeer,
19871998
resp.AcceptedBuyQuote.Scid)
19881999

19892000
return assetHodlInvoice{

0 commit comments

Comments
 (0)