rebase fixes

Author: AmbientTea

toolkit/data-sources/db-sync/src/db_model.rs

@@ -878,7 +878,7 @@ mod tests {
 
 	use super::TxInConfiguration;
 
-	#[sqlx::test(migrations = "./testdata/migrations-v1")]
+	#[sqlx::test(migrations = "./testdata/migrations-tx-in-enabled")]
 	async fn tx_in_configuration_is_enabled_if_tx_in_table_exists(pool: PgPool) {
 		let tx_in_config = TxInConfiguration::from_connection(&pool).await.unwrap();
 

toolkit/data-sources/db-sync/src/lib.rs

@@ -99,7 +99,7 @@
 #![allow(rustdoc::private_intra_doc_links)]
 
 pub use crate::{
-	data_sources::{ConnectionConfig, PgPool, get_connection_from_env, read_mc_epoch_config},
+	data_sources::{ConnectionConfig, PgPool, get_connection_from_env},
 	metrics::{McFollowerMetrics, register_metrics_warn_errors},
 };