wip: fix tests for multi-hop cch

- Using `Script::default()` for udt script is not allowed in tests.
- Fix cell consumed error when sending tx to the mock chain actor.

Author: doitian

crates/fiber-lib/src/ckb/tests/test_utils.rs

@@ -593,7 +593,25 @@ impl Actor for MockChainActor {
             }
             SendTx(tx, reply_port) => {
                 const MAX_CYCLES: u64 = 100_000_000;
-                let (tx_status, result) = {
+                let (tx_status, result) = if let Some(resp) = state.txs.get(&tx.hash().into()) {
+                    // Like a real CKB node, this mock should allow sending
+                    // duplicate transactions. This is required because the
+                    // `Fund(..)` branch may add inputs for UDT channels, and
+                    // processing the same UDT funding transaction multiple
+                    // times would otherwise lead to consumed cell errors.
+                    (
+                        resp.tx_status.clone(),
+                        match &resp.tx_status {
+                            TxStatus::Committed(..) => Ok(()),
+                            TxStatus::Rejected(reason) => {
+                                Err(ckb_sdk::RpcError::Other(anyhow!("{}", reason)))
+                            }
+                            _ => {
+                                unreachable!();
+                            }
+                        },
+                    )
+                } else {
                     match tx.input_pts_iter().find(|input| {
                         state
                             .cell_status
@@ -735,8 +753,9 @@ pub async fn submit_tx(mock_actor: ActorRef<CkbChainMessage>, tx: TransactionVie
     if let Err(error) = call_t!(mock_actor, CkbChainMessage::SendTx, TIMEOUT, tx.clone())
         .expect("chain actor alive")
     {
-        error!("submit tx failed: {:?}", error);
-        return TxStatus::Rejected("submit tx failed".to_string());
+        let reject_reason = format!("submit tx failed: {:?}", error);
+        error!("{}", reject_reason);
+        return TxStatus::Rejected(reject_reason);
     }
     trace_tx(mock_actor, tx.hash().into()).await
 }

crates/fiber-lib/src/fiber/channel.rs

@@ -1228,12 +1228,7 @@ where
 
         let (tlc_info, remove_reason) = state.remove_tlc_with_reason(tlc_id)?;
 
-        // We should only update invoice status to paid if the peer is paying us (i.e., the TLC is received).
-        // For the TLC sent by ourselves (we're paying the peer), we should leave any invoice as it is.
-        // The reason for this is that it is possible that we're paying another peer by sending a TLC and
-        // we have a local invoice with the same payment hash. See the test
-        // test_store_update_subscription_mock_cross_chain_payment for a concrete example.
-        if tlc_id.is_received() && matches!(remove_reason, RemoveTlcReason::RemoveTlcFulfill(_)) {
+        if matches!(remove_reason, RemoveTlcReason::RemoveTlcFulfill(_)) {
             if self.store.get_invoice(&tlc_info.payment_hash).is_some() {
                 debug!(channel = ?channel_id, hash = ?tlc_info.payment_hash, "update invoice status to paid");
                 self.store

crates/fiber-lib/src/fiber/tests/channel.rs

@@ -1,3 +1,4 @@
+use crate::ckb::contracts::get_script_by_contract;
 use crate::ckb::tests::test_utils::complete_commitment_tx;
 use crate::fiber::channel::{ChannelState, CloseFlags, UpdateCommand, XUDT_COMPATIBLE_WITNESS};
 use crate::fiber::config::{DEFAULT_TLC_EXPIRY_DELTA, MAX_PAYMENT_TLC_EXPIRY_LIMIT};
@@ -296,18 +297,28 @@ async fn test_create_channel_with_too_large_amounts() {
         "The total funding amount (18446744069509551614) should be less than 18446744065309551615"
     ));
 
+    let udt_args =
+        hex::decode("32e555f3ff8e135cece1351a6a2971518392c1e30375c1e006ad0ce8eac07947").unwrap();
+    let udt_script = get_script_by_contract(Contract::SimpleUDT, &udt_args);
+
     let params = ChannelParameters {
         node_a_funding_amount: u128::MAX - 100,
         node_b_funding_amount: 101,
-        funding_udt_type_script: Some(Script::default()),
+        funding_udt_type_script: Some(udt_script),
         ..Default::default()
     };
     let res = create_channel_with_nodes(&mut node_a, &mut node_b, params).await;
-    assert!(res.is_err(), "Create channel failed: {:?}", res);
-    assert!(res
-        .unwrap_err()
-        .to_string()
-        .contains("The total UDT funding amount should be less"));
+    assert!(
+        res.is_err(),
+        "Create channel should fail but succeeded: {:?}",
+        res
+    );
+    let err = res.unwrap_err().to_string();
+    assert!(
+        err.contains("The total UDT funding amount should be less"),
+        "Unmatched error: {}",
+        err
+    );
 }
 
 #[tokio::test]

crates/fiber-lib/src/fiber/tests/payment.rs

@@ -1,4 +1,6 @@
 #![allow(clippy::needless_range_loop)]
+use crate::ckb::contracts::get_script_by_contract;
+use crate::ckb::contracts::Contract;
 use crate::fiber::channel::*;
 use crate::fiber::config::DEFAULT_TLC_EXPIRY_DELTA;
 use crate::fiber::config::DEFAULT_TLC_FEE_PROPORTIONAL_MILLIONTHS;
@@ -29,6 +31,12 @@ use std::time::SystemTime;
 use tracing::debug;
 use tracing::error;
 
+fn get_simple_udt_script() -> Script {
+    let args =
+        hex::decode("32e555f3ff8e135cece1351a6a2971518392c1e30375c1e006ad0ce8eac07947").unwrap();
+    get_script_by_contract(Contract::SimpleUDT, &args)
+}
+
 #[tokio::test]
 async fn test_send_payment_custom_records() {
     let (nodes, _channels) = create_n_nodes_network(
@@ -785,7 +793,7 @@ async fn test_send_payment_hophint_for_mixed_channels_with_udt() {
                     node_a_funding_amount: HUGE_CKB_AMOUNT,
                     node_b_funding_amount: HUGE_CKB_AMOUNT,
                     public: true, // not a private channel
-                    funding_udt_type_script: Some(Script::default()), // a UDT channel
+                    funding_udt_type_script: Some(get_simple_udt_script()), // a UDT channel
                     ..Default::default()
                 },
             ),
@@ -3135,6 +3143,7 @@ async fn test_send_payment_self_with_two_nodes() {
 async fn test_send_payment_self_with_mixed_channel() {
     // #678, payself with mixed channel got wrong
     init_tracing();
+    let udt_script = get_simple_udt_script();
 
     let funding_amount = HUGE_CKB_AMOUNT;
     let (nodes, _channels) = create_n_nodes_network_with_params(
@@ -3154,7 +3163,7 @@ async fn test_send_payment_self_with_mixed_channel() {
                     public: true,
                     node_a_funding_amount: funding_amount,
                     node_b_funding_amount: funding_amount,
-                    funding_udt_type_script: Some(Script::default()),
+                    funding_udt_type_script: Some(udt_script.clone()),
                     ..Default::default()
                 },
             ),
@@ -3184,7 +3193,7 @@ async fn test_send_payment_self_with_mixed_channel() {
                     public: true,
                     node_a_funding_amount: funding_amount,
                     node_b_funding_amount: funding_amount,
-                    funding_udt_type_script: Some(Script::default()),
+                    funding_udt_type_script: Some(udt_script.clone()),
                     ..Default::default()
                 },
             ),
@@ -3216,7 +3225,7 @@ async fn test_send_payment_self_with_mixed_channel() {
                     public: true,
                     node_a_funding_amount: funding_amount,
                     node_b_funding_amount: funding_amount,
-                    funding_udt_type_script: Some(Script::default()),
+                    funding_udt_type_script: Some(udt_script.clone()),
                     ..Default::default()
                 },
             ),
@@ -3226,7 +3235,7 @@ async fn test_send_payment_self_with_mixed_channel() {
                     public: true,
                     node_a_funding_amount: funding_amount,
                     node_b_funding_amount: funding_amount,
-                    funding_udt_type_script: Some(Script::default()),
+                    funding_udt_type_script: Some(udt_script.clone()),
                     ..Default::default()
                 },
             ),
@@ -3236,7 +3245,7 @@ async fn test_send_payment_self_with_mixed_channel() {
                     public: true,
                     node_a_funding_amount: funding_amount,
                     node_b_funding_amount: funding_amount,
-                    funding_udt_type_script: Some(Script::default()),
+                    funding_udt_type_script: Some(udt_script.clone()),
                     ..Default::default()
                 },
             ),
@@ -3252,7 +3261,7 @@ async fn test_send_payment_self_with_mixed_channel() {
             amount: Some(1000),
             keysend: Some(true),
             allow_self_payment: true,
-            udt_type_script: Some(Script::default()),
+            udt_type_script: Some(udt_script.clone()),
             ..Default::default()
         })
         .await;
@@ -4519,6 +4528,7 @@ async fn test_send_payment_no_preimage_invoice_will_make_payment_failed() {
 async fn test_send_payment_with_mixed_channel_hops() {
     init_tracing();
     let _span = tracing::info_span!("node", node = "test").entered();
+    let udt_script = get_simple_udt_script();
     let (nodes, channels) = create_n_nodes_network(
         &[
             ((0, 1), (HUGE_CKB_AMOUNT, HUGE_CKB_AMOUNT)),
@@ -4537,7 +4547,7 @@ async fn test_send_payment_with_mixed_channel_hops() {
             public: false,
             node_a_funding_amount: HUGE_CKB_AMOUNT,
             node_b_funding_amount: HUGE_CKB_AMOUNT,
-            funding_udt_type_script: Some(Script::default()), // UDT type
+            funding_udt_type_script: Some(udt_script.clone()), // UDT type
             ..Default::default()
         },
     )

crates/fiber-lib/src/tests/test_utils.rs

@@ -628,7 +628,11 @@ pub(crate) async fn create_n_nodes_network_with_params(
         for node in nodes.iter_mut() {
             let res = node.submit_tx(funding_tx.clone()).await;
             node.add_channel_tx(channel_id, funding_tx.hash().into());
-            assert!(matches!(res, TxStatus::Committed(..)));
+            assert!(
+                matches!(res, TxStatus::Committed(..)),
+                "expect committed tx, got {:?}",
+                res
+            );
         }
     }
     // sleep for a while to make sure network graph is updated