reduce timeout, add log

mm2src/mm2_main/tests/docker_tests/docker_tests_common.rs

@@ -251,11 +251,11 @@ pub struct ZCoinAssetDockerOps {
 impl CoinDockerOps for ZCoinAssetDockerOps {
     fn rpc_client(&self) -> &UtxoRpcClientEnum { &self.coin.as_ref().rpc_client }
     fn wait_ready(&self, expected_tx_version: i32) {
-        let timeout = wait_until_ms(200000);
+        let timeout = wait_until_ms(150000);
+        log!("Waiting for ZOMBIE coinbase tx");
         loop {
             match block_on_f01(self.rpc_client().get_block_count()) {
                 Ok(n) => {
-                    println!("BLOCK {n}");
                     if n > 1 {
                         if let UtxoRpcClientEnum::Native(client) = self.rpc_client() {
                             let hash = block_on_f01(client.get_block_hash(n)).unwrap();

mm2src/mm2_main/tests/docker_tests/z_coin_docker_tests.rs

@@ -6,33 +6,33 @@ use common::{block_on, now_sec, Future01CompatExt};
 
 #[test]
 fn zombie_coin_send_and_refund_maker_payment() {
-    println!("creating coin");
     let (ctx, coin) = z_coin_from_spending_key("ZOMBIE", "secret-extended-key-main1q0k2ga2cqqqqpq8m8j6yl0say83cagrqp53zqz54w38ezs8ly9ly5ptamqwfpq85u87w0df4k8t2lwyde3n9v0gcr69nu4ryv60t0kfcsvkr8h83skwqex2nf0vr32794fmzk89cpmjptzc22lgu5wfhhp8lgf3f5vn2l3sge0udvxnm95k6dtxj2jwlfyccnum7nz297ecyhmd5ph526pxndww0rqq0qly84l635mec0x4yedf95hzn6kcgq8yxts26k98j9g32kjc8y83fe");
-    println!("created coin");
     let time_lock = now_sec() - 3600;
-    let taker_pub = coin.utxo_arc.priv_key_policy.activated_key_or_err().unwrap().public();
     let secret_hash = [0; 20];
-    let pk_data = [1; 32];
-    println!("got coin key");
+
+    let maker_uniq_data = [3; 32];
+
+    let taker_uniq_data = [5; 32];
+    let taker_key_pair = coin.derive_htlc_key_pair(taker_uniq_data.as_slice());
+    let taker_pub = taker_key_pair.public();
+
     let args = SendPaymentArgs {
         time_lock_duration: 0,
         time_lock,
         other_pubkey: taker_pub,
         secret_hash: &secret_hash,
         amount: "0.01".parse().unwrap(),
         swap_contract_address: &None,
-        swap_unique_data: &[],
+        swap_unique_data: maker_uniq_data.as_slice(),
         payment_instructions: &None,
         watcher_reward: None,
         wait_for_confirmation_until: 0,
     };
-    println!("z_addr: {}", coin.my_z_address_encoded());
     let balance = block_on(coin.my_balance().compat()).unwrap();
     println!("balance: {balance:?}");
-    println!("before send maker payement");
     let tx = block_on(coin.send_maker_payment(args)).unwrap();
     log!("swap tx {}", hex::encode(tx.tx_hash_as_bytes().0));
-    println!("after send maker payement");
+    println!("after send maker payment");
 
     let refund_args = RefundPaymentArgs {
         payment_tx: &tx.tx_hex(),
@@ -42,11 +42,9 @@ fn zombie_coin_send_and_refund_maker_payment() {
             maker_secret_hash: &secret_hash,
         },
         swap_contract_address: &None,
-        swap_unique_data: pk_data.as_slice(),
+        swap_unique_data: maker_uniq_data.as_slice(),
         watcher_reward: false,
     };
-    println!("before send maker refund payment");
     let refund_tx = block_on(coin.send_maker_refunds_payment(refund_args)).unwrap();
-    println!("after send maker refund payment");
     log!("refund tx {}", hex::encode(refund_tx.tx_hash_as_bytes().0));
 }