test: integration tests for premium

This commit is to modify and add integration tests for the addition of premium.
ElementsProject · Dec 24, 2023 · 6f44cbc · 6f44cbc
1 parent 1ec38e5
commit 6f44cbc
Show file tree

Hide file tree

Showing 13 changed files with 1,710 additions and 1,083 deletions.
diff --git a/peerswaprpc/server.go b/peerswaprpc/server.go
@@ -144,7 +144,7 @@ func (p *PeerswapServer) SwapOut(ctx context.Context, request *SwapOutRequest) (
 		return nil, fmt.Errorf("peer is not connected")
 	}
 
-	swapOut, err := p.swaps.SwapOut(peerId, request.Asset, shortId.String(), pk, request.SwapAmount)
+	swapOut, err := p.swaps.SwapOut(peerId, request.Asset, shortId.String(), pk, request.SwapAmount, request.GetPremiumLimit())
 	if err != nil {
 		return nil, err
 	}
@@ -268,7 +268,7 @@ func (p *PeerswapServer) SwapIn(ctx context.Context, request *SwapInRequest) (*S
 		return nil, fmt.Errorf("peer is not connected")
 	}
 
-	swapIn, err := p.swaps.SwapIn(peerId, request.Asset, shortId.String(), pk, request.SwapAmount)
+	swapIn, err := p.swaps.SwapIn(peerId, request.Asset, shortId.String(), pk, request.SwapAmount, request.GetPremiumLimit())
 	if err != nil {
 		return nil, err
 	}
@@ -376,10 +376,12 @@ func (p *PeerswapServer) ListPeers(ctx context.Context, request *ListPeersReques
 			}
 
 			peerSwapPeers = append(peerSwapPeers, &PeerSwapPeer{
-				NodeId:          v.PubKey,
-				SwapsAllowed:    poll.PeerAllowed,
-				SupportedAssets: poll.Assets,
-				Channels:        getPeerSwapChannels(v.PubKey, channelRes.Channels),
+				NodeId:                v.PubKey,
+				SwapsAllowed:          poll.PeerAllowed,
+				SwapInPremiumRatePpm:  poll.SwapInPremiumRatePPM,
+				SwapOutPremiumRatePpm: poll.SwapOutPremiumRatePPM,
+				SupportedAssets:       poll.Assets,
+				Channels:              getPeerSwapChannels(v.PubKey, channelRes.Channels),
 				AsSender: &SwapStats{
 					SwapsOut: SenderSwapsOut,
 					SwapsIn:  SenderSwapsIn,
@@ -571,6 +573,7 @@ func PrettyprintFromServiceSwap(swap *swap.SwapStateMachine) *PrettyPrintSwap {
 		ClaimTxId:       swap.Data.ClaimTxId,
 		CancelMessage:   swap.Data.GetCancelMessage(),
 		LndChanId:       lnd_chan_id,
+		PremiumAmount:   swap.Data.GetPremium(),
 	}
 }
 

diff --git a/policy/policy_test.go b/policy/policy_test.go
@@ -84,12 +84,14 @@ func Test_Reload(t *testing.T) {
 	policy, err := create(strings.NewReader(conf))
 	assert.NoError(t, err)
 	assert.EqualValues(t, &Policy{
-		ReserveOnchainMsat: defaultReserveOnchainMsat,
-		PeerAllowlist:      []string{peer1, peer2},
-		SuspiciousPeerList: defaultSuspiciousPeerList,
-		AcceptAllPeers:     accept,
-		MinSwapAmountMsat:  defaultMinSwapAmountMsat,
-		AllowNewSwaps:      defaultAllowNewSwaps,
+		ReserveOnchainMsat:    defaultReserveOnchainMsat,
+		PeerAllowlist:         []string{peer1, peer2},
+		SuspiciousPeerList:    defaultSuspiciousPeerList,
+		AcceptAllPeers:        accept,
+		MinSwapAmountMsat:     defaultMinSwapAmountMsat,
+		AllowNewSwaps:         defaultAllowNewSwaps,
+		SwapInPremiumRatePPM:  defaultSwapInPremiumRatePPM,
+		SwapOutPremiumRatePPM: defaultSwapOutPremiumRatePPM,
 	}, policy)
 
 	newPeer := "new_peer"
@@ -98,12 +100,14 @@ func Test_Reload(t *testing.T) {
 	err = policy.reload(strings.NewReader(newConf))
 	assert.NoError(t, err)
 	assert.EqualValues(t, &Policy{
-		ReserveOnchainMsat: defaultReserveOnchainMsat,
-		PeerAllowlist:      []string{newPeer},
-		SuspiciousPeerList: []string{newPeer},
-		AcceptAllPeers:     defaultAcceptAllPeers,
-		MinSwapAmountMsat:  defaultMinSwapAmountMsat,
-		AllowNewSwaps:      defaultAllowNewSwaps,
+		ReserveOnchainMsat:    defaultReserveOnchainMsat,
+		PeerAllowlist:         []string{newPeer},
+		SuspiciousPeerList:    []string{newPeer},
+		AcceptAllPeers:        defaultAcceptAllPeers,
+		MinSwapAmountMsat:     defaultMinSwapAmountMsat,
+		AllowNewSwaps:         defaultAllowNewSwaps,
+		SwapInPremiumRatePPM:  defaultSwapInPremiumRatePPM,
+		SwapOutPremiumRatePPM: defaultSwapOutPremiumRatePPM,
 	}, policy)
 }
 
@@ -121,12 +125,14 @@ func Test_Reload_NoOverrideOnError(t *testing.T) {
 	policy, err := create(strings.NewReader(conf))
 	assert.NoError(t, err)
 	assert.EqualValues(t, &Policy{
-		ReserveOnchainMsat: defaultReserveOnchainMsat,
-		PeerAllowlist:      []string{peer1, peer2},
-		SuspiciousPeerList: defaultSuspiciousPeerList,
-		AcceptAllPeers:     accept,
-		MinSwapAmountMsat:  defaultMinSwapAmountMsat,
-		AllowNewSwaps:      defaultAllowNewSwaps,
+		ReserveOnchainMsat:    defaultReserveOnchainMsat,
+		PeerAllowlist:         []string{peer1, peer2},
+		SuspiciousPeerList:    defaultSuspiciousPeerList,
+		AcceptAllPeers:        accept,
+		MinSwapAmountMsat:     defaultMinSwapAmountMsat,
+		AllowNewSwaps:         defaultAllowNewSwaps,
+		SwapInPremiumRatePPM:  defaultSwapInPremiumRatePPM,
+		SwapOutPremiumRatePPM: defaultSwapOutPremiumRatePPM,
 	}, policy)
 
 	// copy policy

diff --git a/swap/service_test.go b/swap/service_test.go
@@ -257,7 +257,7 @@ func TestMessageFromUnexpectedPeer(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	aliceSwap, err := aliceSwapService.SwapOut(peer, "btc", channelId, initiator, amount, 0)
+	aliceSwap, err := aliceSwapService.SwapOut(peer, "btc", channelId, initiator, amount, 1000)
 	if err != nil {
 		t.Fatalf(" error swapping oput %v: ", err)
 	}

diff --git a/swap/swap_in_receiver_test.go b/swap/swap_in_receiver_test.go
@@ -25,6 +25,7 @@ func Test_SwapInReceiverValid(t *testing.T) {
 		SwapId:          swapId,
 		Network:         "mainnet",
 		ProtocolVersion: PEERSWAP_PROTOCOL_VERSION,
+		PremiumLimit:    10000,
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -35,7 +36,7 @@ func Test_SwapInReceiverValid(t *testing.T) {
 
 	_, err = swap.SendEvent(Event_OnTxOpenedMessage, &OpeningTxBroadcastedMessage{
 		SwapId:      swap.SwapId,
-		Payreq:      "invoice",
+		Payreq:      "swapin",
 		TxId:        getRandom32ByteHexString(),
 		ScriptOut:   0,
 		BlindingKey: "",
@@ -105,6 +106,7 @@ func Test_SwapInReceiverCancel2(t *testing.T) {
 		SwapId:          swapId,
 		Network:         "mainnet",
 		ProtocolVersion: PEERSWAP_PROTOCOL_VERSION,
+		PremiumLimit:    10000,
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -115,7 +117,7 @@ func Test_SwapInReceiverCancel2(t *testing.T) {
 
 	_, err = swap.SendEvent(Event_OnTxOpenedMessage, &OpeningTxBroadcastedMessage{
 		SwapId:      swap.SwapId,
-		Payreq:      "invoice",
+		Payreq:      "swapin",
 		TxId:        getRandom32ByteHexString(),
 		ScriptOut:   0,
 		BlindingKey: "",

diff --git a/swap/swap_out_sender_test.go b/swap/swap_out_sender_test.go
@@ -52,6 +52,7 @@ func Test_ValidSwap(t *testing.T) {
 		Pubkey:          takerpubkeyhash,
 		Network:         "mainnet",
 		ProtocolVersion: PEERSWAP_PROTOCOL_VERSION,
+		PremiumLimit:    10000,
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -64,8 +65,9 @@ func Test_ValidSwap(t *testing.T) {
 	assert.NotEqual(t, "", swapFSM.Data.SwapOutRequest.Pubkey)
 
 	_, err = swapFSM.SendEvent(Event_OnFeeInvoiceReceived, &SwapOutAgreementMessage{
-		Payreq: FeeInvoice,
-		Pubkey: peer,
+		Payreq:  FeeInvoice,
+		Pubkey:  peer,
+		Premium: 1000,
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -166,6 +168,7 @@ func Test_AbortCsvClaim(t *testing.T) {
 		Pubkey:          takerpubkeyhash,
 		Network:         "mainnet",
 		ProtocolVersion: PEERSWAP_PROTOCOL_VERSION,
+		PremiumLimit:    10000,
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -175,8 +178,9 @@ func Test_AbortCsvClaim(t *testing.T) {
 	assert.NotEqual(t, "", swapFSM.Data.SwapOutRequest.Pubkey)
 
 	_, err = swapFSM.SendEvent(Event_OnFeeInvoiceReceived, &SwapOutAgreementMessage{
-		Payreq: FeeInvoice,
-		Pubkey: peer,
+		Payreq:  FeeInvoice,
+		Pubkey:  peer,
+		Premium: 1000,
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -321,6 +325,9 @@ func (d *dummyLightningClient) DecodePayreq(payreq string) (string, uint64, int6
 	if payreq == "fee" {
 		return "foo", 100 * 1000, 10, nil
 	}
+	if payreq == "swapin" {
+		return "foo", 100000 * 1000, 10, nil
+	}
 	return "foo", (100000 + 1000) * 1000, 10, nil
 }