Fix api simulation test

Author: azarovh

api-server/scanner-lib/src/sync/tests/simulation.rs

@@ -236,7 +236,7 @@ async fn simulation(
             let mut block_builder = tf.make_pos_block_builder().with_random_staking_pool(&mut rng);
 
             for _ in 0..rng.gen_range(10..max_tx_per_block) {
-                block_builder = block_builder.add_test_transaction(&mut rng);
+                block_builder = block_builder.add_test_transaction(&mut rng, false);
             }
 
             let block = block_builder.build(&mut rng);
@@ -335,11 +335,11 @@ async fn simulation(
                             .and_modify(|amount| *amount = (*amount + *to_stake).unwrap())
                             .or_insert(*to_stake);
                     }
-                    TxOutput::Htlc(_, _) => unimplemented!(),
                     | TxOutput::CreateDelegationId(_, _)
                     | TxOutput::Transfer(_, _)
                     | TxOutput::LockThenTransfer(_, _, _)
-                    | TxOutput::ProduceBlockFromStake(_, _) => {}
+                    | TxOutput::ProduceBlockFromStake(_, _)
+                    | TxOutput::Htlc(_, _) => {}
                 });
 
                 tx.inputs().iter().for_each(|inp| match inp {

chainstate/test-framework/src/block_builder.rs

@@ -120,7 +120,11 @@ impl<'f> BlockBuilder<'f> {
     }
 
     /// Adds a transaction that uses random utxos and accounts
-    pub fn add_test_transaction(mut self, rng: &mut (impl Rng + CryptoRng)) -> Self {
+    pub fn add_test_transaction(
+        mut self,
+        rng: &mut (impl Rng + CryptoRng),
+        supper_htlc: bool,
+    ) -> Self {
         let utxo_set = self
             .framework
             .storage
@@ -148,6 +152,7 @@ impl<'f> BlockBuilder<'f> {
                 &self.pos_accounting_store,
                 None,
                 account_nonce_getter,
+                supper_htlc,
             )
             .make(
                 rng,

chainstate/test-framework/src/pos_block_builder.rs

@@ -360,7 +360,11 @@ impl<'f> PoSBlockBuilder<'f> {
     }
 
     /// Adds a transaction that uses random utxos and accounts
-    pub fn add_test_transaction(mut self, rng: &mut (impl Rng + CryptoRng)) -> Self {
+    pub fn add_test_transaction(
+        mut self,
+        rng: &mut (impl Rng + CryptoRng),
+        support_htlc: bool,
+    ) -> Self {
         let utxo_set = self
             .framework
             .storage
@@ -388,6 +392,7 @@ impl<'f> PoSBlockBuilder<'f> {
                 &self.pos_accounting_store,
                 self.staking_pool,
                 account_nonce_getter,
+                support_htlc,
             )
             .make(
                 rng,

chainstate/test-framework/src/random_tx_maker.rs

@@ -144,6 +144,8 @@ pub struct RandomTxMaker<'a> {
 
     account_command_used: bool,
 
+    support_htlc: bool,
+
     // There can be only one Unmint operation per transaction.
     // But it's unknown in advance which token burn would be utilized by unmint operation
     // so we have to collect all burns for all tokens just in case.
@@ -161,6 +163,7 @@ impl<'a> RandomTxMaker<'a> {
         pos_accounting_store: &'a InMemoryPoSAccounting,
         staking_pool: Option<PoolId>,
         account_nonce_getter: Box<dyn Fn(AccountType) -> Option<AccountNonce> + 'a>,
+        support_htlc: bool,
     ) -> Self {
         Self {
             chainstate,
@@ -174,6 +177,7 @@ impl<'a> RandomTxMaker<'a> {
             stake_pool_can_be_created: true,
             delegation_can_be_created: true,
             account_command_used: false,
+            support_htlc,
             unmint_for: None,
             total_tokens_burned: BTreeMap::new(),
             fee_input: None,
@@ -815,18 +819,25 @@ impl<'a> RandomTxMaker<'a> {
                                 destination,
                                 timelock,
                             ),
-                            1 => TxOutput::Htlc(
-                                OutputValue::Coin(new_value),
-                                Box::new(HashedTimelockContract {
-                                    secret_hash: HtlcSecretHash::zero(),
-                                    spend_key: destination,
-                                    refund_timelock: timelock,
-                                    refund_key: key_manager.new_2_of_2_multisig_destination(
-                                        self.chainstate.get_chain_config(),
-                                        rng,
-                                    ),
-                                }),
-                            ),
+                            1 => {
+                                if self.support_htlc {
+                                    TxOutput::Htlc(
+                                        OutputValue::Coin(new_value),
+                                        Box::new(HashedTimelockContract {
+                                            secret_hash: HtlcSecretHash::zero(),
+                                            spend_key: destination,
+                                            refund_timelock: timelock,
+                                            refund_key: key_manager
+                                                .new_2_of_2_multisig_destination(
+                                                    self.chainstate.get_chain_config(),
+                                                    rng,
+                                                ),
+                                        }),
+                                    )
+                                } else {
+                                    TxOutput::Transfer(OutputValue::Coin(new_value), destination)
+                                }
+                            }
                             _ => TxOutput::Transfer(OutputValue::Coin(new_value), destination),
                         }
                     }

chainstate/test-suite/src/tests/tx_verification_simulation.rs

@@ -115,7 +115,7 @@ fn simulation(#[case] seed: Seed, #[case] max_blocks: usize, #[case] max_tx_per_
             let mut block_builder = tf.make_pos_block_builder().with_random_staking_pool(&mut rng);
 
             for _ in 0..rng.gen_range(10..max_tx_per_block) {
-                block_builder = block_builder.add_test_transaction(&mut rng);
+                block_builder = block_builder.add_test_transaction(&mut rng, true);
             }
 
             let block = block_builder.build(&mut rng);
@@ -151,7 +151,7 @@ fn simulation(#[case] seed: Seed, #[case] max_blocks: usize, #[case] max_tx_per_
             let mut block_builder = tf2.make_pos_block_builder().with_random_staking_pool(&mut rng);
 
             for _ in 0..rng.gen_range(10..max_tx_per_block) {
-                block_builder = block_builder.add_test_transaction(&mut rng);
+                block_builder = block_builder.add_test_transaction(&mut rng, true);
             }
 
             let block = block_builder.build(&mut rng);