extend tests

Author: AmbientTea

toolkit/data-sources/db-sync/src/bridge/tests.rs

@@ -90,24 +90,46 @@ fn main_chain_scripts() -> MainChainScripts {
 	}
 }
 
-macro_rules! with_migration_versions {
-	($(async fn $name:ident($pool:ident: PgPool) $body:block )*) => {
+macro_rules! with_migration_versions_and_caching {
+	($(async fn $name:ident($data_source:ident: &dyn TokenBridgeDataSource<ByteString>) $body:block )*) => {
 		$(
 		mod $name {
+			use super::*;
+
+			async fn $name($data_source: &dyn TokenBridgeDataSource<ByteString>) $body
+
+			mod uncached {
 				use super::*;
+				#[allow(unused_imports)]
 				use pretty_assertions::assert_eq;
 
-				async fn $name($pool: PgPool) $body
+				#[sqlx::test(migrations = "./testdata/bridge/migrations-tx-in-enabled")]
+				async fn tx_in_enabled(pool: PgPool) {
+					$name(&create_data_source(pool)).await
+				}
+
+				#[sqlx::test(migrations = "./testdata/bridge/migrations-tx-in-consumed")]
+				async fn tx_in_consumed(pool: PgPool) {
+					$name(&create_data_source(pool)).await
+				}
+			}
+
+			mod cached {
+				use super::*;
+				#[allow(unused_imports)]
+				use pretty_assertions::assert_eq;
 
 				#[sqlx::test(migrations = "./testdata/bridge/migrations-tx-in-enabled")]
-				async fn tx_in_enabled($pool: PgPool) {
-					$name($pool).await
+				async fn tx_in_enabled(pool: PgPool) {
+					$name(&create_cached_source(pool)).await
 				}
 
 				#[sqlx::test(migrations = "./testdata/bridge/migrations-tx-in-consumed")]
-				async fn tx_in_consumed($pool: PgPool) {
-					$name($pool).await
+				async fn tx_in_consumed(pool: PgPool) {
+					$name(&create_cached_source(pool)).await
 				}
+			}
+
 		}
 		)*
 	}
@@ -145,9 +167,8 @@ fn create_cached_source(pool: PgPool) -> CachedTokenBridgeDataSourceImpl {
 	CachedTokenBridgeDataSourceImpl::new(pool, None, blocks, cache_lookahead)
 }
 
-with_migration_versions! {
-	async fn gets_transfers_from_init_to_block_2(pool: PgPool) {
-		let data_source: &dyn TokenBridgeDataSource<ByteString> = &create_data_source(pool);
+with_migration_versions_and_caching! {
+	async fn gets_transfers_from_init_to_block_2(data_source: &dyn TokenBridgeDataSource<ByteString>) {
 		let data_checkpoint = BridgeDataCheckpoint::Utxo(last_ics_init_utxo());
 		let current_mc_block = block_2_hash();
 		let max_transfers = 2;
@@ -163,8 +184,7 @@ with_migration_versions! {
 		assert_eq!(new_checkpoint, BridgeDataCheckpoint::Utxo(user_transfer_1_utxo()))
 	}
 
-	async fn gets_transfers_from_init_to_block_4(pool: PgPool) {
-		let data_source: &dyn TokenBridgeDataSource<ByteString> = &create_data_source(pool);
+	async fn gets_transfers_from_init_to_block_4(data_source: &dyn TokenBridgeDataSource<ByteString>) {
 		let data_checkpoint = BridgeDataCheckpoint::Utxo(last_ics_init_utxo());
 		let current_mc_block = block_4_hash();
 		let max_transfers = 4;
@@ -183,8 +203,7 @@ with_migration_versions! {
 		assert_eq!(new_checkpoint, BridgeDataCheckpoint::Utxo(invalid_transfer_1_utxo()))
 	}
 
-	async fn accepts_block_checkpoint(pool: PgPool) {
-		let data_source: &dyn TokenBridgeDataSource<ByteString> = &create_data_source(pool);
+	async fn accepts_block_checkpoint(data_source: &dyn TokenBridgeDataSource<ByteString>) {
 		let data_checkpoint = BridgeDataCheckpoint::Block(McBlockNumber(1));
 		let current_mc_block = block_4_hash();
 		let max_transfers = 4;
@@ -203,8 +222,7 @@ with_migration_versions! {
 		assert_eq!(new_checkpoint, BridgeDataCheckpoint::Utxo(invalid_transfer_1_utxo()))
 	}
 
-	async fn returns_block_checkpoint_when_no_transfers_are_found(pool: PgPool) {
-		let data_source: &dyn TokenBridgeDataSource<ByteString> = &create_data_source(pool);
+	async fn returns_block_checkpoint_when_no_transfers_are_found(data_source: &dyn TokenBridgeDataSource<ByteString>) {
 		let data_checkpoint = BridgeDataCheckpoint::Block(McBlockNumber(6));
 		let current_mc_block = block_8_hash();
 		let max_transfers = 32;
@@ -219,8 +237,7 @@ with_migration_versions! {
 		assert_eq!(new_checkpoint, BridgeDataCheckpoint::Block(McBlockNumber(8)))
 	}
 
-	async fn returns_block_checkpoint_when_less_than_maximum_transfers_found(pool: PgPool) {
-		let data_source: &dyn TokenBridgeDataSource<ByteString> = &create_data_source(pool);
+	async fn returns_block_checkpoint_when_less_than_maximum_transfers_found(data_source: &dyn TokenBridgeDataSource<ByteString>) {
 		let data_checkpoint = BridgeDataCheckpoint::Block(McBlockNumber(0));
 		let current_mc_block = block_8_hash();
 		let max_transfers = 32;