itest: add groupkey mode to liquidity edge cases

In order to run the liquidity edge cases twice, once using only asset
IDs and once using only group keys, we need to extract the main logic
into a re-usable function that has the group key option on the top
level. If the group key flag is set, then we append the respective group
key opt to the payment & invoice related calls.

Author: GeorgeTsagk

itest/assets_test.go

@@ -726,6 +726,12 @@ func sendAssetKeySendPayment(t *testing.T, src, dst *HarnessNode, amt uint64,
 		opt(cfg)
 	}
 
+	// Nullify assetID if group key is set. RPC methods won't accept both so
+	// let's prioritize the group key if set.
+	if len(cfg.groupKey) > 0 {
+		assetID = []byte{}
+	}
+
 	ctxb := context.Background()
 	ctxt, cancel := context.WithTimeout(ctxb, defaultTimeout)
 	defer cancel()
@@ -1013,6 +1019,12 @@ func payInvoiceWithAssets(t *testing.T, payer, rfqPeer *HarnessNode,
 		opt(cfg)
 	}
 
+	// Nullify assetID if group key is set. RPC methods won't accept both so
+	// let's prioritize the group key if set.
+	if len(cfg.groupKey) > 0 {
+		assetID = []byte{}
+	}
+
 	ctxb := context.Background()
 	ctxt, cancel := context.WithTimeout(ctxb, defaultTimeout)
 	defer cancel()
@@ -1138,6 +1150,12 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
 		opt(cfg)
 	}
 
+	// Nullify assetID if group key is set. RPC methods won't accept both so
+	// let's prioritize the group key if set.
+	if len(cfg.groupKey) > 0 {
+		assetID = []byte{}
+	}
+
 	ctxb := context.Background()
 	ctxt, cancel := context.WithTimeout(ctxb, defaultTimeout)
 	defer cancel()
@@ -1218,12 +1236,12 @@ func assertInvoiceHtlcAssets(t *testing.T, node *HarnessNode,
 
 	var targetID string
 	switch {
-	case len(assetID) > 0:
-		targetID = hex.EncodeToString(assetID)
-
 	case len(groupID) > 0:
 		groupHash := sha256.Sum256(groupID)
 		targetID = hex.EncodeToString(groupHash[:])
+
+	case len(assetID) > 0:
+		targetID = hex.EncodeToString(assetID)
 	}
 
 	var totalAssetAmount uint64
@@ -1274,12 +1292,12 @@ func assertPaymentHtlcAssets(t *testing.T, node *HarnessNode, payHash []byte,
 
 	var targetID string
 	switch {
-	case len(assetID) > 0:
-		targetID = hex.EncodeToString(assetID)
-
 	case len(groupID) > 0:
 		groupHash := sha256.Sum256(groupID)
 		targetID = hex.EncodeToString(groupHash[:])
+
+	case len(assetID) > 0:
+		targetID = hex.EncodeToString(assetID)
 	}
 
 	var totalAssetAmount uint64
@@ -1310,7 +1328,19 @@ type assetHodlInvoice struct {
 }
 
 func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
-	assetAmount uint64, assetID []byte) assetHodlInvoice {
+	assetAmount uint64, assetID []byte,
+	opts ...invoiceOpt) assetHodlInvoice {
+
+	cfg := defaultInvoiceConfig()
+	for _, opt := range opts {
+		opt(cfg)
+	}
+
+	// Nullify assetID if group key is set. RPC methods won't accept both so
+	// let's prioritize the group key if set.
+	if len(cfg.groupKey) > 0 {
+		assetID = []byte{}
+	}
 
 	ctxb := context.Background()
 	ctxt, cancel := context.WithTimeout(ctxb, defaultTimeout)
@@ -1334,6 +1364,7 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
 
 	resp, err := dstTapd.AddInvoice(ctxt, &tchrpc.AddInvoiceRequest{
 		AssetId:     assetID,
+		GroupKey:    cfg.groupKey,
 		AssetAmount: assetAmount,
 		PeerPubkey:  dstRfqPeer.PubKey[:],
 		InvoiceRequest: &lnrpc.Invoice{
@@ -1372,6 +1403,22 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
 	}
 }
 
+// addGroupModeOpt may add a group key option to the opts array, if the group
+// mode boolean is true.
+func addGroupModeOpt(opts *[]payOpt, groupMode bool, groupID []byte) {
+	if groupMode {
+		*opts = append(*opts, withGroupKey(groupID))
+	}
+}
+
+// addGroupModeInvOpt may add a group key option to the opts array, if the group
+// mode boolean is true.
+func addGroupModeInvOpt(opts *[]invoiceOpt, groupMode bool, groupID []byte) {
+	if groupMode {
+		*opts = append(*opts, withInvGroupKey(groupID))
+	}
+}
+
 func waitForSendEvent(t *testing.T,
 	sendEvents taprpc.TaprootAssets_SubscribeSendEventsClient,
 	expectedState tapfreighter.SendState) {