refactor: move migrations (#488)

graphprotocol · Nov 13, 2024 · b0d2cd8 · b0d2cd8
1 parent 304cc56
commit b0d2cd8
Show file tree

Hide file tree

Showing 23 changed files with 58 additions and 58 deletions.
diff --git a/.github/workflows/license_headers_check.yml b/.github/workflows/license_headers_check.yml
@@ -28,5 +28,5 @@ jobs:
             -ignore '.github/*.yml' \
             -ignore '.github/workflows/*.yaml' \
             -ignore '.github/*.yaml' \
-            -ignore 'crates/migrations/*.sql' \
+            -ignore 'migrations/*.sql' \
             .
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Install sqlx
         run: cargo install sqlx-cli --no-default-features --features postgres
       - name: Run the test sqlx migrations
-        run: cargo sqlx migrate run --source crates/migrations
+        run: cargo sqlx migrate run
       - name: Check that the sqlx prepared query metadata is up-to-date
         run: cargo sqlx prepare --workspace --check -- --all-targets --all-features
 
@@ -124,7 +124,7 @@ jobs:
       - name: Install sqlx
         run: cargo install sqlx-cli --no-default-features --features postgres
       - name: Run the test sqlx migrations
-        run: cargo sqlx migrate run --source crates/migrations
+        run: cargo sqlx migrate run
       - name: Run tests and generate coverage report
         run: cargo llvm-cov test --all-features --workspace --lcov --output-path lcov.info
       - name: Upload coverage to Coveralls
@@ -172,6 +172,6 @@ jobs:
       - name: Install sqlx
         run: cargo install sqlx-cli --no-default-features --features postgres
       - name: Run the test sqlx migrations
-        run: cargo sqlx migrate run --source crates/migrations
+        run: cargo sqlx migrate run
       - name: Test documentation code snippets
         run: cargo test --doc --all-features --workspace
diff --git a/crates/common/src/cost_model.rs b/crates/common/src/cost_model.rs
@@ -250,7 +250,7 @@ pub(crate) mod test {
         ]
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn success_cost_models(pool: PgPool) {
         let test_models = test_data();
         let test_deployments = test_models
@@ -312,7 +312,7 @@ pub(crate) mod test {
         }
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn global_fallback_cost_models(pool: PgPool) {
         let test_models = test_data();
         let test_deployments = test_models
@@ -403,7 +403,7 @@ pub(crate) mod test {
         assert_eq!(missing_model.model, global_model.model);
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn success_cost_model(pool: PgPool) {
         add_cost_models(&pool, to_db_models(test_data())).await;
 
@@ -425,7 +425,7 @@ pub(crate) mod test {
         assert_eq!(model.model, Some("default => 0.00025;".to_string()));
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn global_fallback_cost_model(pool: PgPool) {
         let test_models = test_data();
         let global_model = global_cost_model();

diff --git a/crates/common/src/tap/checks/deny_list_check.rs b/crates/common/src/tap/checks/deny_list_check.rs
@@ -224,7 +224,7 @@ mod tests {
         .await
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_sender_denylist(pgpool: PgPool) {
         // Add the sender to the denylist
         sqlx::query!(
@@ -253,7 +253,7 @@ mod tests {
             .is_err());
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_sender_denylist_updates(pgpool: PgPool) {
         let allocation_id = Address::from_str(ALLOCATION_ID).unwrap();
         let signed_receipt =

diff --git a/crates/common/src/tap/checks/value_check.rs b/crates/common/src/tap/checks/value_check.rs
@@ -361,13 +361,13 @@ mod tests {
 
     use super::MinimumValue;
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn initialize_check(pgpool: PgPool) {
         let check = MinimumValue::new(pgpool, Duration::from_secs(0)).await;
         assert_eq!(check.cost_model_map.read().unwrap().len(), 0);
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn should_initialize_check_with_models(pgpool: PgPool) {
         // insert 2 cost models for different deployment_id
         let test_models = crate::cost_model::test::test_data();
@@ -381,7 +381,7 @@ mod tests {
         assert!(check.global_model.read().unwrap().is_none());
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn should_watch_model_insert(pgpool: PgPool) {
         let check = MinimumValue::new(pgpool.clone(), Duration::from_secs(0)).await;
         assert_eq!(check.cost_model_map.read().unwrap().len(), 0);
@@ -397,7 +397,7 @@ mod tests {
         );
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn should_watch_model_remove(pgpool: PgPool) {
         // insert 2 cost models for different deployment_id
         let test_models = crate::cost_model::test::test_data();
@@ -417,7 +417,7 @@ mod tests {
         assert_eq!(check.cost_model_map.read().unwrap().len(), 0);
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn should_start_global_model(pgpool: PgPool) {
         let global_model = global_cost_model();
         add_cost_models(&pgpool, vec![global_model.clone()]).await;
@@ -426,7 +426,7 @@ mod tests {
         assert!(check.global_model.read().unwrap().is_some());
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn should_watch_global_model(pgpool: PgPool) {
         let check = MinimumValue::new(pgpool.clone(), Duration::from_secs(0)).await;
 
@@ -437,7 +437,7 @@ mod tests {
         assert!(check.global_model.read().unwrap().is_some());
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn should_remove_global_model(pgpool: PgPool) {
         let global_model = global_cost_model();
         add_cost_models(&pgpool, vec![global_model.clone()]).await;
@@ -457,7 +457,7 @@ mod tests {
 
     const ALLOCATION_ID: Address = address!("deadbeefcafebabedeadbeefcafebabedeadbeef");
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn should_check_minimal_value(pgpool: PgPool) {
         // insert cost models for different deployment_id
         let test_models = crate::cost_model::test::test_data();
@@ -531,7 +531,7 @@ mod tests {
             .expect("should accept more than minimal");
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn should_check_using_global(pgpool: PgPool) {
         // insert cost models for different deployment_id
         let test_models = crate::cost_model::test::test_data();

diff --git a/crates/tap-agent/src/agent/sender_account.rs b/crates/tap-agent/src/agent/sender_account.rs
@@ -1197,7 +1197,7 @@ pub mod tests {
         (sender, handle, prefix, escrow_accounts_tx)
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_update_allocation_ids(pgpool: PgPool) {
         // Start a mock graphql server using wiremock
         let mock_server = MockServer::start().await;
@@ -1293,7 +1293,7 @@ pub mod tests {
         handle.await.unwrap();
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_new_allocation_id(pgpool: PgPool) {
         // Start a mock graphql server using wiremock
         let mock_server = MockServer::start().await;
@@ -1560,7 +1560,7 @@ pub mod tests {
             .as_nanos() as u64
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_update_receipt_fees_no_rav(pgpool: PgPool) {
         let (sender_account, handle, prefix, _) = create_sender_account(
             pgpool,
@@ -1604,7 +1604,7 @@ pub mod tests {
         handle.await.unwrap();
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_update_receipt_fees_trigger_rav(pgpool: PgPool) {
         let (sender_account, handle, prefix, _) = create_sender_account(
             pgpool,
@@ -1665,7 +1665,7 @@ pub mod tests {
         handle.await.unwrap();
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_counter_greater_limit_trigger_rav(pgpool: PgPool) {
         let (sender_account, handle, prefix, _) = create_sender_account(
             pgpool,
@@ -1732,7 +1732,7 @@ pub mod tests {
         handle.await.unwrap();
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_remove_sender_account(pgpool: PgPool) {
         let (mock_escrow_subgraph_server, _mock_ecrow_subgraph) = mock_escrow_subgraph().await;
         let (sender_account, handle, prefix, _) = create_sender_account(
@@ -1769,7 +1769,7 @@ pub mod tests {
     }
 
     /// Test that the deny status is correctly loaded from the DB at the start of the actor
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_init_deny(pgpool: PgPool) {
         sqlx::query!(
             r#"
@@ -1803,7 +1803,7 @@ pub mod tests {
         assert!(deny);
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_retry_unaggregated_fees(pgpool: PgPool) {
         // we set to zero to block the sender, no matter the fee
         let max_unaggregated_fees_per_sender: u128 = 0;
@@ -1856,7 +1856,7 @@ pub mod tests {
         handle.await.unwrap();
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_deny_allow(pgpool: PgPool) {
         async fn get_deny_status(sender_account: &ActorRef<SenderAccountMessage>) -> bool {
             call!(sender_account, SenderAccountMessage::GetDeny).unwrap()
@@ -1956,7 +1956,7 @@ pub mod tests {
         handle.await.unwrap();
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_initialization_with_pending_ravs_over_the_limit(pgpool: PgPool) {
         // add last non-final ravs
         let signed_rav = create_rav(*ALLOCATION_ID_0, SIGNER.0.clone(), 4, ESCROW_VALUE);
@@ -1982,7 +1982,7 @@ pub mod tests {
         handle.await.unwrap();
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_unaggregated_fees_over_balance(pgpool: PgPool) {
         // add last non-final ravs
         let signed_rav = create_rav(*ALLOCATION_ID_0, SIGNER.0.clone(), 4, ESCROW_VALUE / 2);
@@ -2078,7 +2078,7 @@ pub mod tests {
         handle.await.unwrap();
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_pending_rav_already_redeemed_and_redeem(pgpool: PgPool) {
         // Start a mock graphql server using wiremock
         let mock_server = MockServer::start().await;
@@ -2156,7 +2156,7 @@ pub mod tests {
         handle.await.unwrap();
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_thawing_deposit_process(pgpool: PgPool) {
         // add last non-final ravs
         let signed_rav = create_rav(*ALLOCATION_ID_0, SIGNER.0.clone(), 4, ESCROW_VALUE / 2);
@@ -2208,7 +2208,7 @@ pub mod tests {
         handle.await.unwrap();
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_sender_denied_close_allocation_stop_retry(pgpool: PgPool) {
         // we set to 1 to block the sender on a really low value
         let max_unaggregated_fees_per_sender: u128 = 1;

diff --git a/crates/tap-agent/src/agent/sender_accounts_manager.rs b/crates/tap-agent/src/agent/sender_accounts_manager.rs
@@ -670,7 +670,7 @@ mod tests {
         )
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_create_sender_accounts_manager(pgpool: PgPool) {
         let (_, (actor, join_handle)) = create_sender_accounts_manager(pgpool).await;
         actor.stop_and_wait(None, None).await.unwrap();
@@ -708,7 +708,7 @@ mod tests {
         )
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_pending_sender_allocations(pgpool: PgPool) {
         let (_, state) = create_state(pgpool.clone()).await;
 
@@ -732,7 +732,7 @@ mod tests {
         assert_eq!(pending_allocation_id.get(&SENDER.1).unwrap().len(), 2);
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_update_sender_allocation(pgpool: PgPool) {
         let (prefix, (actor, join_handle)) = create_sender_accounts_manager(pgpool).await;
 
@@ -766,7 +766,7 @@ mod tests {
         join_handle.await.unwrap();
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_create_sender_account(pgpool: PgPool) {
         struct DummyActor;
         #[async_trait::async_trait]
@@ -803,7 +803,7 @@ mod tests {
         handle.await.unwrap();
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_deny_sender_account_on_failure(pgpool: PgPool) {
         struct DummyActor;
         #[async_trait::async_trait]
@@ -857,7 +857,7 @@ mod tests {
         handle.await.unwrap();
     }
 
-    #[sqlx::test(migrations = "../migrations")]
+    #[sqlx::test(migrations = "../../migrations")]
     async fn test_receive_notifications_(pgpool: PgPool) {
         let prefix = format!(
             "test-{}",