Refactor tests

Author: smiasojed

Cargo.lock

@@ -113,6 +113,7 @@ serial_test.workspace = true
 mockall = "0.13"
 globset = "0.4"
 paste = "1.0"
+rstest = "0.24"
 similar-asserts.workspace = true
 svm = { package = "svm-rs", version = "0.5", default-features = false, features = [
     "rustls",

crates/forge/Cargo.toml

@@ -4,73 +4,66 @@ use crate::{config::*, test_helpers::TEST_DATA_REVIVE};
 use foundry_test_utils::Filter;
 use revive_strategy::ReviveRuntimeMode;
 use revm::primitives::hardfork::SpecId;
+use rstest::rstest;
 
+#[rstest]
+#[case::pvm(ReviveRuntimeMode::Pvm)]
+#[case::evm(ReviveRuntimeMode::Evm)]
 #[tokio::test(flavor = "multi_thread")]
-async fn test_revive_balance_migration() {
-    let runtime_mode = ReviveRuntimeMode::Pvm;
+async fn test_revive_balance_migration(#[case] runtime_mode: ReviveRuntimeMode) {
     let runner = TEST_DATA_REVIVE.runner_revive(runtime_mode);
     let filter = Filter::new("testBalanceMigration", "EvmReviveMigrationTest", ".*/revive/.*");
     TestConfig::with_filter(runner, filter).spec_id(SpecId::SHANGHAI).run().await;
 }
 
+#[rstest]
+#[case::pvm(ReviveRuntimeMode::Pvm)]
+#[case::evm(ReviveRuntimeMode::Evm)]
 #[tokio::test(flavor = "multi_thread")]
-async fn test_revive_nonce_migration() {
-    let runtime_mode = ReviveRuntimeMode::Pvm;
+async fn test_revive_nonce_migration(#[case] runtime_mode: ReviveRuntimeMode) {
     let runner = TEST_DATA_REVIVE.runner_revive(runtime_mode);
     let filter = Filter::new("testNonceMigration", "EvmReviveMigrationTest", ".*/revive/.*");
     TestConfig::with_filter(runner, filter).spec_id(SpecId::SHANGHAI).run().await;
 }
 
-// Enable it after new pallet-revive is being used
-// #[tokio::test(flavor = "multi_thread")]
-// async fn test_revive_precision_preservation() {
-//     let runtime_mode = ReviveRuntimeMode::Pvm;
-//     let runner = TEST_DATA_REVIVE.runner_revive(runtime_mode);
-//     let filter = Filter::new("testPrecisionPreservation", "EvmReviveMigrationTest",
-// ".*/revive/.*");     TestConfig::with_filter(runner,
-// filter).spec_id(SpecId::SHANGHAI).run().await; }
-
-#[tokio::test(flavor = "multi_thread")]
-async fn test_revive_pvm_bytecode_migration() {
-    let runtime_mode = ReviveRuntimeMode::Pvm;
-    let runner = TEST_DATA_REVIVE.runner_revive(runtime_mode);
-    let filter =
-        Filter::new("testBytecodeMigrationToEvm", "EvmReviveMigrationTest", ".*/revive/.*");
-    TestConfig::with_filter(runner, filter).spec_id(SpecId::SHANGHAI).run().await;
-}
-
+#[rstest]
+#[case::pvm(ReviveRuntimeMode::Pvm)]
+#[case::evm(ReviveRuntimeMode::Evm)]
 #[tokio::test(flavor = "multi_thread")]
-async fn test_revive_evm_bytecode_migration() {
-    let runtime_mode = ReviveRuntimeMode::Evm;
+async fn test_revive_bytecode_migration(#[case] runtime_mode: ReviveRuntimeMode) {
     let runner = TEST_DATA_REVIVE.runner_revive(runtime_mode);
     let filter =
         Filter::new("testBytecodeMigrationToEvm", "EvmReviveMigrationTest", ".*/revive/.*");
     TestConfig::with_filter(runner, filter).spec_id(SpecId::SHANGHAI).run().await;
 }
 
+#[rstest]
+#[case::pvm(ReviveRuntimeMode::Pvm)]
+// TODO: Add Evm test when pallet-revive will allow for Evm bytecode upload
 #[tokio::test(flavor = "multi_thread")]
-async fn test_evm_to_revive_pvm_bytecode_migration() {
-    let runtime_mode = ReviveRuntimeMode::Pvm;
+async fn test_revive_bytecode_migration_to_revive(#[case] runtime_mode: ReviveRuntimeMode) {
     let runner = TEST_DATA_REVIVE.runner_revive(runtime_mode);
     let filter =
         Filter::new("testBytecodeMigrationToRevive", "EvmReviveMigrationTest", ".*/revive/.*");
     TestConfig::with_filter(runner, filter).spec_id(SpecId::SHANGHAI).run().await;
 }
 
-// TODO: Enable when pallet-revive's EVM mode supports uploading EVM bytecode
-// Currently getting CodeRejected errors even though pallet-revive uses REVM
+// Enable it after new pallet-revive is being used
+// #[rstest]
+// #[case::pvm(ReviveRuntimeMode::Pvm)]
+// #[case::evm(ReviveRuntimeMode::Evm)]
 // #[tokio::test(flavor = "multi_thread")]
-// async fn test_evm_to_revive_evm_bytecode_migration() {
-//     let runtime_mode = ReviveRuntimeMode::Evm;
+// async fn test_revive_precision_preservation(#[case] runtime_mode: ReviveRuntimeMode) {
 //     let runner = TEST_DATA_REVIVE.runner_revive(runtime_mode);
-//     let filter =
-//         Filter::new("testBytecodeMigrationToRevive", "EvmReviveMigrationTest", ".*/revive/.*");
-//     TestConfig::with_filter(runner, filter).spec_id(SpecId::SHANGHAI).run().await;
-// }
+//     let filter = Filter::new("testPrecisionPreservation", "EvmReviveMigrationTest",
+// ".*/revive/.*");     TestConfig::with_filter(runner,
+// filter).spec_id(SpecId::SHANGHAI).run().await; }
 
+// #[rstest]
+// #[case::pvm(ReviveRuntimeMode::Pvm)]
+// #[case::evm(ReviveRuntimeMode::Evm)]
 // #[tokio::test(flavor = "multi_thread")]
-// async fn test_revive_timestamp_migration() {
-//     let runtime_mode = ReviveRuntimeMode::Pvm;
+// async fn test_revive_timestamp_migration(#[case] runtime_mode: ReviveRuntimeMode) {
 //     let runner = TEST_DATA_REVIVE.runner_revive(runtime_mode);
 //     let filter = Filter::new("testTimestampMigration", "EvmReviveMigrationTest", ".*/revive/.*");
 //     TestConfig::with_filter(runner, filter).spec_id(SpecId::SHANGHAI).run().await;