chore: more delegate_enum to reduce repetitive code (#6474)

Author: hanabi1224

src/interpreter/fvm2.rs

@@ -98,7 +98,7 @@ impl<DB: Blockstore + Send + Sync + 'static> ForestExternsV2<DB> {
 
         let state = StateTree::new_from_root(Arc::clone(self.chain_index.db()), &self.root)?;
 
-        let addr = resolve_to_key_addr(&state, &tbs, &worker.into())?;
+        let addr = resolve_to_key_addr(&state, &tbs, &worker)?;
 
         let network_version = self.chain_config.network_version(self.epoch);
         let gas_used = cal_gas_used_from_stats(tbs.stats.borrow(), network_version)?;

src/interpreter/fvm3.rs

@@ -98,7 +98,7 @@ impl<DB: Blockstore + Send + Sync + 'static> ForestExterns<DB> {
 
         let ms = miner::State::load(&tbs, actor.code, actor.state)?;
 
-        let worker = ms.info(&tbs)?.worker.into();
+        let worker = ms.info(&tbs)?.worker;
 
         let state = StateTree::new_from_root(Arc::clone(self.chain_index.db()), &self.root)?;
 

src/interpreter/fvm4.rs

@@ -97,7 +97,7 @@ impl<DB: Blockstore + Send + Sync + 'static> ForestExterns<DB> {
 
         let ms = miner::State::load(&tbs, actor.code, actor.state)?;
 
-        let worker = ms.info(&tbs)?.worker.into();
+        let worker = ms.info(&tbs)?.worker;
 
         let state = StateTree::new_from_root(Arc::clone(self.chain_index.db()), &self.root)?;
 

src/lotus_json/miner_info.rs

@@ -82,71 +82,63 @@ impl HasLotusJson for MinerInfo {
                 "WorkerChangeEpoch": 0
             }),
             Self {
-                owner: Address::default().into(),
-                worker: Address::default().into(),
+                owner: Address::default(),
+                worker: Address::default(),
                 new_worker: Default::default(),
                 control_addresses: Default::default(),
                 worker_change_epoch: Default::default(),
                 peer_id: Default::default(),
                 multiaddrs: Default::default(),
                 window_post_proof_type:
                     fvm_shared2::sector::RegisteredPoStProof::StackedDRGWinning2KiBV1,
-                sector_size: crate::shim::sector::SectorSize::_2KiB.into(),
+                sector_size: crate::shim::sector::SectorSize::_2KiB,
                 window_post_partition_sectors: Default::default(),
                 consensus_fault_elapsed: Default::default(),
                 pending_owner_address: Default::default(),
-                beneficiary: Address::default().into(),
+                beneficiary: Address::default(),
                 beneficiary_term: Default::default(),
                 pending_beneficiary_term: Default::default(),
             },
         )]
     }
     fn into_lotus_json(self) -> Self::LotusJson {
         MinerInfoLotusJson {
-            owner: self.owner.into(),
-            worker: self.worker.into(),
-            new_worker: AddressOrEmpty(self.new_worker.map(|addr| addr.into())),
-            control_addresses: self
-                .control_addresses
-                .into_iter()
-                .map(|a| a.into())
-                .collect(),
+            owner: self.owner,
+            worker: self.worker,
+            new_worker: AddressOrEmpty(self.new_worker),
+            control_addresses: self.control_addresses,
             worker_change_epoch: self.worker_change_epoch,
             peer_id: PeerId::try_from(self.peer_id).map(|id| id.to_base58()).ok(),
             multiaddrs: self.multiaddrs.into_iter().map(|addr| addr.0).collect(),
             window_po_st_proof_type: self.window_post_proof_type,
-            sector_size: self.sector_size.into(),
+            sector_size: self.sector_size,
             window_po_st_partition_sectors: self.window_post_partition_sectors,
             consensus_fault_elapsed: self.consensus_fault_elapsed,
             // NOTE: In Lotus this field is never set for any of the versions, so we have to ignore
             // it too.
             // See: <https://github.com/filecoin-project/lotus/blob/b6a77dfafcf0110e95840fca15a775ed663836d8/chain/actors/builtin/miner/v12.go#L370>.
             pending_owner_address: None,
-            beneficiary: self.beneficiary.into(),
+            beneficiary: self.beneficiary,
             beneficiary_term: self.beneficiary_term,
             pending_beneficiary_term: self.pending_beneficiary_term,
         }
     }
     fn from_lotus_json(lotus_json: Self::LotusJson) -> Self {
         MinerInfo {
-            owner: lotus_json.owner.into(),
-            worker: lotus_json.worker.into(),
-            new_worker: lotus_json.new_worker.0.map(|addr| addr.into()),
-            control_addresses: lotus_json
-                .control_addresses
-                .into_iter()
-                .map(|a| a.into())
-                .collect(),
+            owner: lotus_json.owner,
+            worker: lotus_json.worker,
+            new_worker: lotus_json.new_worker.0,
+            control_addresses: lotus_json.control_addresses,
             worker_change_epoch: lotus_json.worker_change_epoch,
             peer_id: lotus_json.peer_id.map_or_else(Vec::new, |s| s.into_bytes()),
             multiaddrs: lotus_json.multiaddrs.into_iter().map(BytesDe).collect(),
             window_post_proof_type: lotus_json.window_po_st_proof_type,
-            sector_size: lotus_json.sector_size.into(),
+            sector_size: lotus_json.sector_size,
             window_post_partition_sectors: lotus_json.window_po_st_partition_sectors,
             consensus_fault_elapsed: lotus_json.consensus_fault_elapsed,
             // Ignore this field as it is never set on Lotus side.
             pending_owner_address: None,
-            beneficiary: lotus_json.beneficiary.into(),
+            beneficiary: lotus_json.beneficiary,
             beneficiary_term: lotus_json.beneficiary_term,
             pending_beneficiary_term: lotus_json.pending_beneficiary_term,
         }

src/rpc/methods/f3.rs

@@ -256,7 +256,7 @@ impl GetPowerTable {
                     if ts.epoch() <= miner_info.consensus_fault_elapsed {
                         return Ok(());
                     }
-                    id_power_worker_mappings.push((id, power, miner_info.worker.into()));
+                    id_power_worker_mappings.push((id, power, miner_info.worker));
                     Ok(())
                 })?;
             }
@@ -299,7 +299,7 @@ impl GetPowerTable {
                     if ts.epoch() <= miner_info.consensus_fault_elapsed {
                         return Ok(());
                     }
-                    id_power_worker_mappings.push((id, power, miner_info.worker.into()));
+                    id_power_worker_mappings.push((id, power, miner_info.worker));
                     Ok(())
                 })?;
             }
@@ -342,7 +342,7 @@ impl GetPowerTable {
                     if ts.epoch() <= miner_info.consensus_fault_elapsed {
                         return Ok(());
                     }
-                    id_power_worker_mappings.push((id, power, miner_info.worker.into()));
+                    id_power_worker_mappings.push((id, power, miner_info.worker));
                     Ok(())
                 })?;
             }
@@ -385,7 +385,7 @@ impl GetPowerTable {
                     if ts.epoch() <= miner_info.consensus_fault_elapsed {
                         return Ok(());
                     }
-                    id_power_worker_mappings.push((id, power, miner_info.worker.into()));
+                    id_power_worker_mappings.push((id, power, miner_info.worker));
                     Ok(())
                 })?;
             }

src/rpc/methods/state.rs

@@ -35,7 +35,6 @@ use crate::shim::actors::{
 use crate::shim::address::Payload;
 use crate::shim::machine::BuiltinActorManifest;
 use crate::shim::message::{Message, MethodNum};
-use crate::shim::piece::PaddedPieceSize;
 use crate::shim::sector::{SectorNumber, SectorSize};
 use crate::shim::state_tree::{ActorID, StateTree};
 use crate::shim::{
@@ -1033,7 +1032,7 @@ impl RpcMethod<3> for StateMinerInitialPledgeCollateral {
         let market_state: market::State = ctx.state_manager.get_actor_state(&ts)?;
         let (w, vw) = market_state.verify_deals_for_activation(
             ctx.store(),
-            address.into(),
+            address,
             pci.deal_ids,
             ts.epoch(),
             pci.expiration,
@@ -1053,16 +1052,14 @@ impl RpcMethod<3> for StateMinerInitialPledgeCollateral {
             &Arc::new(ctx.store()),
             ts.parent_state(),
         )?;
-        let initial_pledge: TokenAmount = reward_state
-            .initial_pledge_for_power(
-                &sector_weight,
-                pledge_collateral,
-                power_smoothed,
-                &circ_supply.fil_circulating.into(),
-                power_state.ramp_start_epoch(),
-                power_state.ramp_duration_epochs(),
-            )?
-            .into();
+        let initial_pledge = reward_state.initial_pledge_for_power(
+            &sector_weight,
+            pledge_collateral,
+            power_smoothed,
+            &circ_supply.fil_circulating,
+            power_state.ramp_start_epoch(),
+            power_state.ramp_duration_epochs(),
+        )?;
 
         let (q, _) = (initial_pledge * INITIAL_PLEDGE_NUM).div_rem(INITIAL_PLEDGE_DEN);
         Ok(q)
@@ -1096,7 +1093,7 @@ impl RpcMethod<3> for StateMinerPreCommitDepositForPower {
         let market_state: market::State = ctx.state_manager.get_actor_state(&ts)?;
         let (w, vw) = market_state.verify_deals_for_activation(
             ctx.store(),
-            address.into(),
+            address,
             pci.deal_ids,
             ts.epoch(),
             pci.expiration,
@@ -1114,9 +1111,8 @@ impl RpcMethod<3> for StateMinerPreCommitDepositForPower {
         let power_smoothed = power_state.total_power_smoothed();
 
         let reward_state: reward::State = ctx.state_manager.get_actor_state(&ts)?;
-        let deposit: TokenAmount = reward_state
-            .pre_commit_deposit_for_power(power_smoothed, sector_weight)?
-            .into();
+        let deposit: TokenAmount =
+            reward_state.pre_commit_deposit_for_power(power_smoothed, sector_weight)?;
         let (value, _) = (deposit * INITIAL_PLEDGE_NUM).div_rem(INITIAL_PLEDGE_DEN);
         Ok(value)
     }
@@ -1966,12 +1962,12 @@ impl RpcMethod<1> for StateMarketParticipants {
         let locked_table = market_state.locked_table(ctx.store())?;
         let mut result = HashMap::new();
         escrow_table.for_each(|address, escrow| {
-            let locked = locked_table.get(&address.into())?;
+            let locked = locked_table.get(address)?;
             result.insert(
                 address.to_string(),
                 MarketBalance {
                     escrow: escrow.clone(),
-                    locked: locked.into(),
+                    locked,
                 },
             );
             Ok(())
@@ -2025,10 +2021,10 @@ impl RpcMethod<3> for StateDealProviderCollateralBounds {
 
         let (min, max) = reward_state.deal_provider_collateral_bounds(
             policy,
-            PaddedPieceSize::from(size).into(),
+            size.into(),
             &power_claim.raw_byte_power,
             baseline_power,
-            &supply.into(),
+            &supply,
         );
 
         let min = min
@@ -2037,7 +2033,7 @@ impl RpcMethod<3> for StateDealProviderCollateralBounds {
             .div_euclid(&deal_provider_collateral_denom);
 
         Ok(DealCollateralBounds {
-            max: max.into(),
+            max,
             min: TokenAmount::from_atto(min),
         })
     }
@@ -3177,16 +3173,14 @@ impl RpcMethod<4> for StateMinerInitialPledgeForSector {
 
         let (epochs_since_start, duration) = get_pledge_ramp_params(&ctx, ts.epoch(), &ts)?;
 
-        let initial_pledge: TokenAmount = reward_state
-            .initial_pledge_for_power(
-                &sector_weight,
-                pledge_collateral,
-                power_smoothed,
-                &circ_supply.fil_circulating.into(),
-                epochs_since_start,
-                duration,
-            )?
-            .into();
+        let initial_pledge = reward_state.initial_pledge_for_power(
+            &sector_weight,
+            pledge_collateral,
+            power_smoothed,
+            &circ_supply.fil_circulating,
+            epochs_since_start,
+            duration,
+        )?;
 
         let (value, _) = (initial_pledge * INITIAL_PLEDGE_NUM).div_rem(INITIAL_PLEDGE_DEN);
         Ok(value)

src/rpc/types/deal_impl.rs

@@ -39,16 +39,16 @@ impl From<DealProposal> for ApiDealProposal {
         } = p;
         Self {
             piece_cid,
-            piece_size: piece_size.0,
+            piece_size: piece_size.into(),
             verified_deal,
-            client: client.into(),
-            provider: provider.into(),
+            client,
+            provider,
             label,
             start_epoch,
             end_epoch,
-            storage_price_per_epoch: storage_price_per_epoch.into(),
-            provider_collateral: provider_collateral.into(),
-            client_collateral: client_collateral.into(),
+            storage_price_per_epoch,
+            provider_collateral,
+            client_collateral,
         }
     }
 }

src/rpc/types/mod.rs

@@ -19,19 +19,19 @@ mod tests;
 use crate::beacon::BeaconEntry;
 use crate::blocks::TipsetKey;
 use crate::lotus_json::{LotusJson, lotus_json_with_self};
-use crate::shim::actors::market::AllocationID;
-use crate::shim::actors::market::{DealProposal, DealState};
-use crate::shim::actors::miner::DeadlineInfo;
-use crate::shim::executor::StampedEvent;
 use crate::shim::{
+    actors::{
+        market::{AllocationID, DealProposal, DealState},
+        miner::DeadlineInfo,
+    },
     address::Address,
     clock::ChainEpoch,
     deal::DealID,
     econ::TokenAmount,
-    executor::Receipt,
+    executor::{Receipt, StampedEvent},
     fvm_shared_latest::MethodNum,
     message::Message,
-    sector::{ExtendedSectorInfo, RegisteredSealProof, SectorNumber, StoragePower},
+    sector::{ExtendedSectorInfo, RegisteredSealProof, SectorNumber, SectorSize, StoragePower},
 };
 use chrono::Utc;
 use cid::Cid;
@@ -514,7 +514,7 @@ pub struct MiningBaseInfo {
     #[schemars(with = "LotusJson<Address>")]
     pub worker_key: Address,
     #[schemars(with = "u64")]
-    pub sector_size: fvm_shared2::sector::SectorSize,
+    pub sector_size: SectorSize,
     #[serde(with = "crate::lotus_json")]
     #[schemars(with = "LotusJson<BeaconEntry>")]
     pub prev_beacon_entry: BeaconEntry,