give result its own crate (#121)

Author: buffalojoec

Cargo.lock

@@ -7,6 +7,7 @@ members = [
     "harness",
     "keys",
     "programs/*",
+    "result",
     "test-programs/*",
 ]
 resolver = "2"
@@ -38,6 +39,7 @@ mollusk-svm-fuzz-fixture-firedancer = { path = "fuzz/fixture-fd", version = "0.1
 mollusk-svm-fuzz-fs = { path = "fuzz/fs", version = "0.1.5" }
 mollusk-svm-keys = { path = "keys", version = "0.1.5" }
 mollusk-svm-programs-memo = { path = "programs/memo", version = "0.1.5" }
+mollusk-svm-result = { path = "result", version = "0.1.5" }
 mollusk-svm-programs-token = { path = "programs/token", version = "0.1.5" }
 num-format = "0.4.4"
 openssl = "0.10.72"

Cargo.toml

@@ -49,6 +49,7 @@ publish:
 		"mollusk-svm-fuzz-fs" \
 		"mollusk-svm-fuzz-fixture" \
 		"mollusk-svm-fuzz-fixture-firedancer" \
+		"mollusk-svm-result" \
 		"mollusk-svm" \
 		"mollusk-svm-bencher" \
 		"mollusk-svm-programs-memo" \

Makefile

@@ -17,6 +17,7 @@ all-builtins = [
 fuzz = [
     "dep:mollusk-svm-fuzz-fixture",
     "dep:mollusk-svm-fuzz-fs",
+    "mollusk-svm-result/fuzz",
 ]
 fuzz-fd = [
     "dep:mollusk-svm-fuzz-fixture-firedancer",
@@ -34,6 +35,7 @@ mollusk-svm-fuzz-fixture = { workspace = true, optional = true }
 mollusk-svm-fuzz-fixture-firedancer = { workspace = true, optional = true }
 mollusk-svm-fuzz-fs = { workspace = true, optional = true }
 mollusk-svm-keys = { workspace = true }
+mollusk-svm-result = { workspace = true }
 solana-account = { workspace = true }
 solana-bpf-loader-program = { workspace = true }
 solana-clock = { workspace = true }

harness/Cargo.toml

@@ -7,7 +7,6 @@
 use {
     crate::{
         compile_accounts::{compile_accounts, CompiledAccounts},
-        result::InstructionResult,
         Mollusk, DEFAULT_LOADER_KEY,
     },
     agave_feature_set::FeatureSet,
@@ -20,6 +19,7 @@ use {
         metadata::Metadata as FuzzMetadata,
         Fixture as FuzzFixture,
     },
+    mollusk_svm_result::InstructionResult,
     solana_account::Account,
     solana_compute_budget::compute_budget::ComputeBudget,
     solana_instruction::{error::InstructionError, AccountMeta, Instruction},

harness/src/fuzz/firedancer.rs

@@ -4,11 +4,8 @@ pub mod firedancer;
 pub mod mollusk;
 
 use {
-    crate::{result::InstructionResult, Mollusk},
-    mollusk_svm_fuzz_fs::FsHandler,
-    solana_account::Account,
-    solana_instruction::Instruction,
-    solana_pubkey::Pubkey,
+    crate::Mollusk, mollusk_svm_fuzz_fs::FsHandler, mollusk_svm_result::InstructionResult,
+    solana_account::Account, solana_instruction::Instruction, solana_pubkey::Pubkey,
 };
 
 pub fn generate_fixtures_from_mollusk_test(

harness/src/fuzz/mod.rs

@@ -5,19 +5,16 @@
 //! Only available when the `fuzz` feature is enabled.
 
 use {
-    crate::{
-        result::{InstructionResult, ProgramResult},
-        sysvar::Sysvars,
-        Mollusk,
-    },
+    crate::{sysvar::Sysvars, Mollusk},
     agave_feature_set::FeatureSet,
     mollusk_svm_fuzz_fixture::{
         context::Context as FuzzContext, effects::Effects as FuzzEffects,
         sysvars::Sysvars as FuzzSysvars, Fixture as FuzzFixture,
     },
+    mollusk_svm_result::InstructionResult,
     solana_account::Account,
     solana_compute_budget::compute_budget::ComputeBudget,
-    solana_instruction::{error::InstructionError, Instruction},
+    solana_instruction::Instruction,
     solana_pubkey::Pubkey,
     solana_slot_hashes::SlotHashes,
     solana_sysvar::last_restart_slot::LastRestartSlot,
@@ -52,57 +49,6 @@ impl From<&FuzzSysvars> for Sysvars {
     }
 }
 
-impl From<&InstructionResult> for FuzzEffects {
-    fn from(input: &InstructionResult) -> Self {
-        let compute_units_consumed = input.compute_units_consumed;
-        let execution_time = input.execution_time;
-        let return_data = input.return_data.clone();
-
-        let program_result = match &input.program_result {
-            ProgramResult::Success => 0,
-            ProgramResult::Failure(e) => u64::from(e.clone()),
-            ProgramResult::UnknownError(_) => u64::MAX, //TODO
-        };
-
-        let resulting_accounts = input.resulting_accounts.clone();
-
-        Self {
-            compute_units_consumed,
-            execution_time,
-            program_result,
-            return_data,
-            resulting_accounts,
-        }
-    }
-}
-
-impl From<&FuzzEffects> for InstructionResult {
-    fn from(input: &FuzzEffects) -> Self {
-        let compute_units_consumed = input.compute_units_consumed;
-        let execution_time = input.execution_time;
-        let return_data = input.return_data.clone();
-
-        let raw_result = if input.program_result == 0 {
-            Ok(())
-        } else {
-            Err(InstructionError::from(input.program_result))
-        };
-
-        let program_result = raw_result.clone().into();
-
-        let resulting_accounts = input.resulting_accounts.clone();
-
-        Self {
-            compute_units_consumed,
-            execution_time,
-            program_result,
-            raw_result,
-            return_data,
-            resulting_accounts,
-        }
-    }
-}
-
 pub struct ParsedFixtureContext {
     pub accounts: Vec<(Pubkey, Account)>,
     pub compute_budget: ComputeBudget,

harness/src/fuzz/mollusk.rs

@@ -445,22 +445,21 @@ pub mod file;
 #[cfg(any(feature = "fuzz", feature = "fuzz-fd"))]
 pub mod fuzz;
 pub mod program;
-pub mod result;
 pub mod sysvar;
 
+// Re-export result module from mollusk-svm-result crate
+pub use mollusk_svm_result as result;
 #[cfg(any(feature = "fuzz", feature = "fuzz-fd"))]
-use result::Compare;
+use mollusk_svm_result::Compare;
 use {
     crate::{
-        account_store::AccountStore,
-        compile_accounts::CompiledAccounts,
-        program::ProgramCache,
-        result::{Check, CheckContext, Config, ContextResult, InstructionResult},
+        account_store::AccountStore, compile_accounts::CompiledAccounts, program::ProgramCache,
         sysvar::Sysvars,
     },
     agave_feature_set::FeatureSet,
     agave_precompiles::get_precompile,
     mollusk_svm_error::error::{MolluskError, MolluskPanic},
+    mollusk_svm_result::{Check, CheckContext, Config, ContextResult, InstructionResult},
     solana_account::Account,
     solana_compute_budget::compute_budget::ComputeBudget,
     solana_fee_structure::FeeStructure,