fix existing tests

Author: vmmon

crates/module-system/module-implementations/sov-uniqueness/tests/integration/call_tests.rs

@@ -1,5 +1,6 @@
 use sov_modules_api::macros::config_value;
 use sov_modules_api::{CredentialId, TxEffect};
+use sov_modules_api::capabilities::UniquenessData;
 use sov_test_utils::{BatchType, SlotInput, TransactionTestCase, TxProcessingError};
 use sov_uniqueness::Uniqueness;
 
@@ -58,15 +59,15 @@ fn do_max_stored_tx_hashes_per_credential_test() {
     // Generate txs to fill up our "bucket" of stored transaction hashes.
     for i in 0..txs_per_generation {
         for generation in 0..num_generations {
-            txs.push(generate_value_setter_tx(generation, i as u32, &admin));
+            txs.push(generate_value_setter_tx(UniquenessData::Generation(generation), i as u32, &admin));
         }
     }
     // We divided txs evenly across generations - if there was a remainder, account for it by putting the
     // extra txs in the first bucket.
     for i in 0..extra_txs_in_first_generation {
         txs.push(generate_value_setter_tx(
-            0,
-            (i + txs_per_generation) as u32,
+            UniquenessData::Generation(0),
+	    (i + txs_per_generation) as u32,
             &admin,
         ))
     }
@@ -87,7 +88,7 @@ fn do_max_stored_tx_hashes_per_credential_test() {
     // Send one more transaction with a current generation number.
     // This transaction should be skipped because it would cause the bucket to overflow.
     runner.execute_transaction(TransactionTestCase {
-        input: generate_value_setter_tx(0, u32::MAX, &admin),
+        input: generate_value_setter_tx(UniquenessData::Generation(0), u32::MAX, &admin),
         assert: Box::new(move |ctx, _| {
             let TxEffect::Skipped(skipped) = ctx.tx_receipt else {
                 panic!("Transaction should be skipped");
@@ -106,7 +107,7 @@ fn do_max_stored_tx_hashes_per_credential_test() {
     // Increment the generation number. Now the transaction should be accepted because it won't cause the bucket to overflow.
     // Note that we need to add 1 to the number of generations because we have a strict inequality comparison for buckets.
     runner.execute_transaction(TransactionTestCase {
-        input: generate_value_setter_tx(num_generations + 1, txs_per_generation as u32, &admin),
+        input: generate_value_setter_tx(UniquenessData::Generation(num_generations + 1), txs_per_generation as u32, &admin),
         assert: Box::new(move |ctx, _| {
             assert!(
                 ctx.tx_receipt.is_successful(),

crates/module-system/module-implementations/sov-uniqueness/tests/integration/utils.rs

@@ -79,12 +79,12 @@ pub(crate) fn generate_default_tx(
                 create_contract_tx,
             ))
         }
-        UniquenessData::Generation(generation) => generate_value_setter_tx(generation, 10, admin),
+        x => generate_value_setter_tx(x, 10, admin),
     }
 }
 
 pub(crate) fn generate_value_setter_tx(
-    generation: u64,
+    nonce: UniquenessData,
     value: u32,
     admin: &TestUser<S>,
 ) -> TransactionType<RT, S> {
@@ -99,7 +99,7 @@ pub(crate) fn generate_value_setter_tx(
         config_chain_id(),
         TEST_DEFAULT_MAX_PRIORITY_FEE,
         TEST_DEFAULT_MAX_FEE,
-        UniquenessData::Generation(generation),
+        nonce,
         None,
     );