FIX: Fix lints, update test callers

consensus-shipyard · Nov 29, 2023 · 3406feb · 3406feb
1 parent 5aa5559
commit 3406feb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/fendermint/testing/contract-test/src/ipc/registry.rs b/fendermint/testing/contract-test/src/ipc/registry.rs
@@ -5,25 +5,20 @@ use anyhow::Context;
 use fendermint_vm_actor_interface::eam::EthAddress;
 use fendermint_vm_actor_interface::init::builtin_actor_eth_addr;
 use fendermint_vm_actor_interface::ipc::SUBNETREGISTRY_ACTOR_ID;
-use fendermint_vm_interpreter::fvm::state::fevm::{ContractCaller, MockProvider, NoRevert};
+use fendermint_vm_interpreter::fvm::state::fevm::{ContractCaller, MockProvider};
 use fendermint_vm_interpreter::fvm::state::FvmExecState;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_shared::ActorID;
-use ipc_actors_abis::subnet_actor_getter_facet::SubnetActorGetterFacet;
-use ipc_actors_abis::subnet_actor_manager_facet::{
-    SubnetActorManagerFacet, SubnetActorManagerFacetErrors,
-};
-use ipc_actors_abis::subnet_registry::{SubnetRegistry, SubnetRegistryErrors};
+use ipc_actors_abis::subnet_registry_diamond::SubnetRegistryDiamondErrors;
 
-pub use ipc_actors_abis::subnet_registry::ConstructorParams as SubnetConstructorParams;
+pub use ipc_actors_abis::register_subnet_facet::{
+    ConstructorParams as SubnetConstructorParams, RegisterSubnetFacet,
+};
 
 #[derive(Clone)]
 pub struct RegistryCaller<DB> {
     addr: EthAddress,
-    registry: ContractCaller<DB, SubnetRegistry<MockProvider>, SubnetRegistryErrors>,
-    _getter: ContractCaller<DB, SubnetActorGetterFacet<MockProvider>, NoRevert>,
-    _manager:
-        ContractCaller<DB, SubnetActorManagerFacet<MockProvider>, SubnetActorManagerFacetErrors>,
+    register: ContractCaller<DB, RegisterSubnetFacet<MockProvider>, SubnetRegistryDiamondErrors>,
 }
 
 impl<DB> Default for RegistryCaller<DB> {
@@ -37,9 +32,7 @@ impl<DB> RegistryCaller<DB> {
         let addr = builtin_actor_eth_addr(actor_id);
         Self {
             addr,
-            registry: ContractCaller::new(addr, SubnetRegistry::new),
-            _getter: ContractCaller::new(addr, SubnetActorGetterFacet::new),
-            _manager: ContractCaller::new(addr, SubnetActorManagerFacet::new),
+            register: ContractCaller::new(addr, RegisterSubnetFacet::new),
         }
     }
 
@@ -58,7 +51,7 @@ impl<DB: Blockstore> RegistryCaller<DB> {
         params: SubnetConstructorParams,
     ) -> anyhow::Result<EthAddress> {
         let addr = self
-            .registry
+            .register
             .call(state, |c| c.new_subnet_actor(params))
             .context("failed to create new subnet")?;
         Ok(EthAddress(addr.0))

diff --git a/fendermint/testing/contract-test/src/ipc/subnet.rs b/fendermint/testing/contract-test/src/ipc/subnet.rs
@@ -15,7 +15,7 @@ use fvm_shared::econ::TokenAmount;
 use ipc_actors_abis::subnet_actor_getter_facet::{self as getter, SubnetActorGetterFacet};
 use ipc_actors_abis::subnet_actor_manager_facet::{self as manager, SubnetActorManagerFacet};
 
-pub use ipc_actors_abis::subnet_registry::ConstructorParams as SubnetConstructorParams;
+pub use ipc_actors_abis::register_subnet_facet::ConstructorParams as SubnetConstructorParams;
 
 #[derive(Clone)]
 pub struct SubnetCaller<DB> {

diff --git a/fendermint/testing/contract-test/tests/staking/machine.rs b/fendermint/testing/contract-test/tests/staking/machine.rs
@@ -103,7 +103,7 @@ impl StateMachine for StakingMachine {
 
         // TODO: Need to add field to specify release queue lock time.
         let params = SubnetConstructorParams {
-            parent_id: ipc_actors_abis::subnet_registry::SubnetID { root, route },
+            parent_id: ipc_actors_abis::register_subnet_facet::SubnetID { root, route },
             ipc_gateway_addr: gateway.addr().into(),
             consensus: 0, // TODO: What are the options?
             bottom_up_check_period: child_ipc.gateway.bottom_up_check_period,

diff --git a/fendermint/vm/actor_interface/src/ipc.rs b/fendermint/vm/actor_interface/src/ipc.rs
@@ -276,7 +276,7 @@ pub mod gateway {
 
     use crate::eam::EthAddress;
 
-    pub const CONTRACT_NAME: &'static str = "GatewayDiamond";
+    pub const CONTRACT_NAME: &str = "GatewayDiamond";
     pub const METHOD_INVOKE_CONTRACT: u64 = crate::evm::Method::InvokeContract as u64;
 
     // Constructor parameters aren't generated as part of the Rust bindings.
@@ -405,7 +405,7 @@ pub mod registry {
 
     type FunctionSelector = [u8; 4];
 
-    pub const CONTRACT_NAME: &'static str = "SubnetRegistryDiamond";
+    pub const CONTRACT_NAME: &str = "SubnetRegistryDiamond";
 
     /// Container type `ConstructorParameters`.
     ///
@@ -426,7 +426,7 @@ pub mod subnet {
     use ipc_actors_abis::gateway_router_facet::GatewayRouterFacetErrors;
     use ipc_actors_abis::subnet_actor_manager_facet::SubnetActorManagerFacetErrors;
 
-    pub const CONTRACT_NAME: &'static str = "SubnetActorDiamond";
+    pub const CONTRACT_NAME: &str = "SubnetActorDiamond";
 
     // The subnet actor has its own errors, but it also invokes the gateway, which might revert for its own reasons.
     revert_errors! {