test: Changed to use peerswaprpc response

Author: YusukeShimizu

test/setup.go

@@ -483,10 +483,10 @@ func clnclnElementsSetup(t *testing.T, fundAmt uint64) (*testframework.BitcoinNo
 
 	// Give liquid funds to nodes to have something to swap.
 	for _, lightningd := range lightningds {
-		var result clightning.GetAddressResponse
+		var result peerswaprpc.GetAddressResponse
 		lightningd.Rpc.Request(&clightning.LiquidGetAddress{}, &result)
 		_ = liquidd.GenerateBlocks(20)
-		_, err = liquidd.Rpc.Call("sendtoaddress", result.LiquidAddress, 10., "", "", false, false, 1, "UNSET")
+		_, err = liquidd.Rpc.Call("sendtoaddress", result.Address, 10., "", "", false, false, 1, "UNSET")
 		require.NoError(t, err)
 	}
 
@@ -775,10 +775,10 @@ func mixedElementsSetup(t *testing.T, fundAmt uint64, funder fundingNode) (*test
 	}
 
 	// Give liquid funds to nodes to have something to swap.
-	var lar clightning.GetAddressResponse
+	var lar peerswaprpc.GetAddressResponse
 	cln.Rpc.Request(&clightning.LiquidGetAddress{}, &lar)
 	_ = liquidd.GenerateBlocks(20)
-	_, err = liquidd.Rpc.Call("sendtoaddress", lar.LiquidAddress, 10., "", "", false, false, 1, "UNSET")
+	_, err = liquidd.Rpc.Call("sendtoaddress", lar.Address, 10., "", "", false, false, 1, "UNSET")
 	require.NoError(t, err)
 
 	r, err := peerswapd.PeerswapClient.LiquidGetAddress(context.Background(), &peerswaprpc.GetAddressRequest{})
@@ -819,12 +819,12 @@ type CLightningNodeWithLiquid struct {
 }
 
 func (n *CLightningNodeWithLiquid) GetBtcBalanceSat() (uint64, error) {
-	var response clightning.GetBalanceResponse
+	var response peerswaprpc.GetBalanceResponse
 	err := n.Rpc.Request(&clightning.LiquidGetBalance{}, &response)
 	if err != nil {
 		return 0, err
 	}
-	return response.LiquidBalance, nil
+	return response.GetSatAmount(), nil
 }
 
 type LndNodeWithLiquid struct {