fix: reduce repetitive code in enum match blocks (#6453)

Author: hanabi1224

Cargo.lock

@@ -196,6 +196,7 @@ similar = "2"
 slotmap = "1"
 smallvec = "1"
 smart-default = "0.7"
+spire_enum = "1"
 stacker = "0.1"
 static_assertions = "1"
 statrs = "0.18"

Cargo.toml

@@ -46,5 +46,5 @@ where
 
     let acc_st = account::State::load(store, act.code, act.state)?;
 
-    Ok(acc_st.pubkey_address().into())
+    Ok(acc_st.pubkey_address())
 }

src/interpreter/mod.rs

@@ -53,6 +53,7 @@ use fvm4::{
     },
 };
 use num::Zero;
+use spire_enum::prelude::delegated_enum;
 use std::time::{Duration, Instant};
 
 pub(in crate::interpreter) type ForestMachineV2<DB> =
@@ -139,6 +140,7 @@ impl BlockMessages {
 
 /// Interpreter which handles execution of state transitioning messages and
 /// returns receipts from the VM execution.
+#[delegated_enum(impl_conversions)]
 pub enum VM<DB: Blockstore + Send + Sync + 'static> {
     VM2(ForestExecutorV2<DB>),
     VM3(ForestExecutorV3<DB>),
@@ -272,11 +274,7 @@ where
 
     /// Flush stores in VM and return state root.
     pub fn flush(&mut self) -> anyhow::Result<Cid> {
-        match self {
-            VM::VM2(fvm_executor) => Ok(fvm_executor.flush()?),
-            VM::VM3(fvm_executor) => Ok(fvm_executor.flush()?),
-            VM::VM4(fvm_executor) => Ok(fvm_executor.flush()?),
-        }
+        Ok(delegate_vm!(self.flush()?))
     }
 
     /// Get actor state from an address. Will be resolved to ID address.

src/interpreter/vm.rs

@@ -29,7 +29,7 @@ impl HasLotusJson for State {
 
     fn into_lotus_json(self) -> Self::LotusJson {
         AccountStateLotusJson {
-            address: self.pubkey_address().into(),
+            address: self.pubkey_address(),
         }
     }
 

src/lotus_json/actors/states/account_state.rs

@@ -2,15 +2,17 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use super::super::convert::{from_address_v3_to_v2, from_address_v4_to_v2};
-use crate::shim;
+use crate::shim::{self, address::Address};
 use serde::Serialize;
+use spire_enum::prelude::delegated_enum;
 
 /// Account actor method.
 pub type Method = fil_actor_account_state::v8::Method;
 
 /// Account actor state.
 #[derive(Serialize, Debug)]
 #[serde(untagged)]
+#[delegated_enum(impl_conversions)]
 pub enum State {
     V8(fil_actor_account_state::v8::State),
     V9(fil_actor_account_state::v9::State),
@@ -25,19 +27,8 @@ pub enum State {
 }
 
 impl State {
-    pub fn pubkey_address(&self) -> fvm_shared2::address::Address {
-        match self {
-            State::V8(st) => st.address,
-            State::V9(st) => st.address,
-            State::V10(st) => from_address_v3_to_v2(st.address),
-            State::V11(st) => from_address_v3_to_v2(st.address),
-            State::V12(st) => from_address_v4_to_v2(st.address),
-            State::V13(st) => from_address_v4_to_v2(st.address),
-            State::V14(st) => from_address_v4_to_v2(st.address),
-            State::V15(st) => from_address_v4_to_v2(st.address),
-            State::V16(st) => from_address_v4_to_v2(st.address),
-            State::V17(st) => from_address_v4_to_v2(st.address),
-        }
+    pub fn pubkey_address(&self) -> Address {
+        delegate_state!(self.address.into())
     }
 
     pub fn default_latest_version(address: fvm_shared4::address::Address) -> Self {