walletrpc: extract leases marshall function

lnrpc/walletrpc/walletkit_server.go

@@ -1078,6 +1078,17 @@ func (w *WalletKit) FundPsbt(_ context.Context,
 	}
 
 	// Convert the lock leases to the RPC format.
+	rpcLocks := marshallLeases(locks)
+
+	return &FundPsbtResponse{
+		FundedPsbt:        rawPsbt.Bytes(),
+		ChangeOutputIndex: changeIndex,
+		LockedUtxos:       rpcLocks,
+	}, nil
+}
+
+// marshallLeases converts the lock leases to the RPC format.
+func marshallLeases(locks []*wtxmgr.LockedOutput) []*UtxoLease {
 	rpcLocks := make([]*UtxoLease, len(locks))
 	for idx, lock := range locks {
 		rpcLocks[idx] = &UtxoLease{
@@ -1091,11 +1102,7 @@ func (w *WalletKit) FundPsbt(_ context.Context,
 		}
 	}
 
-	return &FundPsbtResponse{
+	return rpcLocks
-		FundedPsbt:        rawPsbt.Bytes(),
-		ChangeOutputIndex: changeIndex,
-		LockedUtxos:       rpcLocks,
-	}, nil
 }
 
 // FinalizePsbt expects a partial transaction with all inputs and outputs fully