Injectable primitives (#1470)

* injectable extern behaviour

* shift Verifier trait methods into primitives

* implement overrides for all methods in FakePrimitives

* implement overrides in TestVM for verifier functionality

* remove redundant VM trait fields

* additional comments

* MockPrimitives (#1473)

* export FakePrimitives from fakes

* export FakePrimitives

Author: alexytsu

runtime/src/runtime/fvm.rs

@@ -11,6 +11,7 @@ use fvm_sdk::NO_DATA_BLOCK_ID;
 use fvm_shared::address::{Address, Payload};
 use fvm_shared::chainid::ChainID;
 use fvm_shared::clock::ChainEpoch;
+use fvm_shared::consensus::ConsensusFault;
 use fvm_shared::crypto::hash::SupportedHashes;
 use fvm_shared::crypto::signature::{
     Signature, SECP_PUB_LEN, SECP_SIG_LEN, SECP_SIG_MESSAGE_HASH_SIZE,
@@ -38,8 +39,7 @@ use crate::runtime::actor_blockstore::ActorBlockstore;
 use crate::runtime::builtins::Type;
 use crate::runtime::randomness::draw_randomness;
 use crate::runtime::{
-    ActorCode, ConsensusFault, DomainSeparationTag, MessageInfo, Policy, Primitives, RuntimePolicy,
-    Verifier,
+    ActorCode, DomainSeparationTag, MessageInfo, Policy, Primitives, RuntimePolicy,
 };
 use crate::{actor_error, ActorError, AsActorError, Runtime, SendError};
 
@@ -443,13 +443,10 @@ where
         fvm::crypto::recover_secp_public_key(hash, signature)
             .map_err(|e| anyhow!("failed to recover pubkey; exit code: {}", e))
     }
-}
 
-#[cfg(not(feature = "fake-proofs"))]
-impl<B> Verifier for FvmRuntime<B>
-where
-    B: Blockstore,
-{
+    // FVM Verifier methods
+
+    #[cfg(not(feature = "fake-proofs"))]
     fn verify_post(&self, verify_info: &WindowPoStVerifyInfo) -> Result<(), Error> {
         match fvm::crypto::verify_post(verify_info) {
             Ok(true) => Ok(()),
@@ -458,6 +455,7 @@ where
         }
     }
 
+    #[cfg(not(feature = "fake-proofs"))]
     fn verify_consensus_fault(
         &self,
         h1: &[u8],
@@ -468,11 +466,13 @@ where
             .map_err(|e| anyhow!("failed to verify fault: {}", e))
     }
 
+    #[cfg(not(feature = "fake-proofs"))]
     fn batch_verify_seals(&self, batch: &[SealVerifyInfo]) -> anyhow::Result<Vec<bool>> {
         fvm::crypto::batch_verify_seals(batch)
             .map_err(|e| anyhow!("failed to verify batch seals: {}", e))
     }
 
+    #[cfg(not(feature = "fake-proofs"))]
     fn verify_aggregate_seals(
         &self,
         aggregate: &AggregateSealVerifyProofAndInfos,
@@ -484,20 +484,18 @@ where
         }
     }
 
+    #[cfg(not(feature = "fake-proofs"))]
     fn verify_replica_update(&self, replica: &ReplicaUpdateInfo) -> Result<(), Error> {
         match fvm::crypto::verify_replica_update(replica) {
             Ok(true) => Ok(()),
             Ok(false) => Err(Error::msg("invalid replica")),
             Err(e) => Err(anyhow!("failed to verify replica: {}", e)),
         }
     }
-}
 
-#[cfg(feature = "fake-proofs")]
-impl<B> Verifier for FvmRuntime<B>
-where
-    B: Blockstore,
-{
+    // Fake Verifier methods
+
+    #[cfg(feature = "fake-proofs")]
     fn verify_post(&self, verify_info: &WindowPoStVerifyInfo) -> Result<(), Error> {
         let mut info = verify_info.clone();
         if info.proofs.len() != 1 {
@@ -521,6 +519,7 @@ where
         Err(Error::msg("[fake-post-validation] window post was invalid"))
     }
 
+    #[cfg(feature = "fake-proofs")]
     fn verify_consensus_fault(
         &self,
         _h1: &[u8],
@@ -530,17 +529,20 @@ where
         Ok(None)
     }
 
+    #[cfg(feature = "fake-proofs")]
     fn batch_verify_seals(&self, batch: &[SealVerifyInfo]) -> anyhow::Result<Vec<bool>> {
         Ok(batch.iter().map(|_| true).collect())
     }
 
+    #[cfg(feature = "fake-proofs")]
     fn verify_aggregate_seals(
         &self,
         _aggregate: &AggregateSealVerifyProofAndInfos,
     ) -> Result<(), Error> {
         Ok(())
     }
 
+    #[cfg(feature = "fake-proofs")]
     fn verify_replica_update(&self, _replica: &ReplicaUpdateInfo) -> Result<(), Error> {
         Ok(())
     }

runtime/src/runtime/mod.rs

@@ -6,12 +6,8 @@ use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::CborStore;
 use fvm_shared::address::Address;
 use fvm_shared::clock::ChainEpoch;
-use fvm_shared::consensus::ConsensusFault;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::randomness::RANDOMNESS_LENGTH;
-use fvm_shared::sector::{
-    AggregateSealVerifyProofAndInfos, ReplicaUpdateInfo, SealVerifyInfo, WindowPoStVerifyInfo,
-};
 use fvm_shared::version::NetworkVersion;
 use fvm_shared::{ActorID, MethodNum, Response};
 use serde::de::DeserializeOwned;
@@ -47,7 +43,7 @@ pub use vm_api::Primitives;
 
 /// Runtime is the VM's internal runtime object.
 /// this is everything that is accessible to actors, beyond parameters.
-pub trait Runtime: Primitives + Verifier + RuntimePolicy {
+pub trait Runtime: Primitives + RuntimePolicy {
     type Blockstore: Blockstore;
 
     /// The network protocol version number at the current epoch.
@@ -275,35 +271,3 @@ pub trait MessageInfo {
     /// The message gas premium
     fn gas_premium(&self) -> TokenAmount;
 }
-
-/// filcrypto verification primitives provided by the runtime
-pub trait Verifier {
-    /// Verifies a window proof of spacetime.
-    fn verify_post(&self, verify_info: &WindowPoStVerifyInfo) -> Result<(), anyhow::Error>;
-
-    /// Verifies that two block headers provide proof of a consensus fault:
-    /// - both headers mined by the same actor
-    /// - headers are different
-    /// - first header is of the same or lower epoch as the second
-    /// - at least one of the headers appears in the current chain at or after epoch `earliest`
-    /// - the headers provide evidence of a fault (see the spec for the different fault types).
-    /// The parameters are all serialized block headers. The third "extra" parameter is consulted only for
-    /// the "parent grinding fault", in which case it must be the sibling of h1 (same parent tipset) and one of the
-    /// blocks in the parent of h2 (i.e. h2's grandparent).
-    /// Returns nil and an error if the headers don't prove a fault.
-    fn verify_consensus_fault(
-        &self,
-        h1: &[u8],
-        h2: &[u8],
-        extra: &[u8],
-    ) -> Result<Option<ConsensusFault>, anyhow::Error>;
-
-    fn batch_verify_seals(&self, batch: &[SealVerifyInfo]) -> anyhow::Result<Vec<bool>>;
-
-    fn verify_aggregate_seals(
-        &self,
-        aggregate: &AggregateSealVerifyProofAndInfos,
-    ) -> Result<(), anyhow::Error>;
-
-    fn verify_replica_update(&self, replica: &ReplicaUpdateInfo) -> Result<(), anyhow::Error>;
-}