fix: reduce repetitive code in enum match blocks by hanabi1224 · Pull Request #6453 · ChainSafe/forest

hanabi1224 · 2026-01-20T15:29:29Z

Summary of changes

Changes introduced in this pull request:

Reference issue to close (if applicable)

Closes

Change checklist

I have performed a self-review of my own code,
I have made corresponding changes to the documentation. All new code adheres to the team's documentation standards,
I have added tests that prove my fix is effective or that my feature works (if possible),
I have made sure the CHANGELOG is up-to-date. All user-facing changes should be reflected in this document.

Summary by CodeRabbit

New Features
- Added support for an additional virtual machine backend to expand execution platform options.
Refactor
- Enabled delegated enum conversions across interpreter and actor components to reduce duplication and simplify multi-version handling.
- Simplified address handling by removing unnecessary conversions in several resolution and serialization paths.
Chores
- Added a build dependency to enable delegation tooling and bumped a dev-dependency version.

_{✏️ Tip: You can customize this high-level summary in your review settings.}

coderabbitai · 2026-01-20T15:29:38Z

Walkthrough

Adds workspace dependency spire_enum; applies its delegated_enum macro to several multi-version enums; introduces a new VM variant VM4(ForestExecutorV4<DB>); replaces manual per-variant conversion logic with delegation helpers; and removes several redundant .into() address conversions.

Changes

Cohort / File(s)	Summary
Dependency updates `Cargo.toml`	Added workspace dependency `spire_enum = "1"`; bumped dev-dependency `ra_ap_syntax` `0.0.315` → `0.0.316`.
VM enum `src/interpreter/vm.rs`	Added `VM4(ForestExecutorV4<DB>)` to `pub enum VM<DB: Blockstore + Send + Sync + 'static>` and annotated enum with `#[delegated_enum(impl_conversions)]`; added `use spire_enum::prelude::delegated_enum`. Review variant handling and conversions.
Miner actor enums `src/shim/actors/builtin/miner/mod.rs`	Annotated `pub enum Deadline` and `pub enum Partition<'a>` with `#[delegated_enum(impl_conversions)]`; replaced manual per-variant conversion closures/matches with delegation helpers (`delegate_deadline!`, `delegate_partition!`); adjusted imports and lifetimes. Inspect macro-generated conversions and borrowing/lifetime correctness.
Account actor / State enum `src/shim/actors/builtin/account/mod.rs`	Added `#[delegated_enum(impl_conversions)]` to `pub enum State`; changed `pubkey_address` return type from `fvm_shared2::address::Address` to crate `Address` and switched implementation to use `delegate_state!(self.address.into())`. Verify public API and conversion correctness.
Address conversion simplifications `src/interpreter/mod.rs`, `src/lotus_json/actors/states/account_state.rs`, `src/shim/state_tree.rs`	Removed unnecessary `.into()` conversions when returning account public-key addresses; now return `pubkey_address()` directly. Confirm propagated types remain correct across callers.

Sequence Diagram(s)

(Skipped — changes are enum/delegation-focused and small control-flow tweaks; not a multi-component sequential flow.)

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~45 minutes

Suggested reviewers

akaladarshi
LesnyRumcajs
sudo-shashank

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 68.75% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (2 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title 'fix: reduce repetitive code in enum match blocks' directly aligns with the changeset, which uses delegated_enum macros to eliminate repetitive enum matching and conversion code across multiple files.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

codecov · 2026-01-20T16:01:18Z

Codecov Report

❌ Patch coverage is 20.00000% with 28 lines in your changes missing coverage. Please review.
✅ Project coverage is 59.47%. Comparing base (26757f5) to head (f060b73).
⚠️ Report is 1 commits behind head on main.

Files with missing lines	Patch %	Lines
src/shim/actors/builtin/miner/mod.rs	6.89%	18 Missing and 9 partials ⚠️
src/interpreter/mod.rs	0.00%	1 Missing ⚠️

Additional details and impacted files

Files with missing lines	Coverage Δ
src/interpreter/vm.rs	`79.34% <100.00%> (+0.70%)`	⬆️
src/lotus_json/actors/states/account_state.rs	`100.00% <100.00%> (ø)`
src/shim/actors/builtin/account/mod.rs	`100.00% <100.00%> (+37.50%)`	⬆️
src/shim/state_tree.rs	`57.23% <100.00%> (ø)`
src/interpreter/mod.rs	`0.00% <0.00%> (ø)`
src/shim/actors/builtin/miner/mod.rs	`15.06% <6.89%> (-0.43%)`	⬇️

... and 6 files with indirect coverage changes

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 26757f5...f060b73. Read the comment docs.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

LesnyRumcajs · 2026-01-21T12:40:33Z

-            VM::VM3(fvm_executor) => Ok(fvm_executor.flush()?),
-            VM::VM4(fvm_executor) => Ok(fvm_executor.flush()?),
-        }
+        Ok(delegate_vm!(self.flush()?))


to my understanding, we can avoid the declarative macro via #[delegate_impl], no?

Tried #[delegate_impl] but it does not compile. According to the doc, #[delegate_impl] is used for trait impls.
https://docs.rs/spire_enum/1.0.0/spire_enum/index.html#2-delegate_impl-inherenttrait-impl-attribute-macro

Hm, indeed. I wonder if VM should've been a trait. Something to consider in the future, but outside of the scope of this PR.

…code

LesnyRumcajs · 2026-01-22T13:16:15Z

-            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),


How does it do it now? What's the error message in case of a fiasco?

Sorry, I don't quite get it. This method has no error propogation.

It doesn't, but it panics with a certain string.

pub fn from_address_v3_to_v2(addr: AddressV3) -> AddressV2 { AddressV2::from_bytes(&addr.to_bytes()) .expect("Couldn't convert between FVM3 and FVM2 addresses.") }

Given the conversion is not trivial (one has to call from_bytes etc. and check if it worked), my question is what is generated under the hood.

No conversion happens here, plz note that the fn return type has been changed to shim::Address. Previously, all addresses are converted to v2, then converted to shim::Address here

Ah okay, I missed the signature change. LGTM.

…code

fix: reduce repetitive code in enum match blocks

49a6a88

hanabi1224 marked this pull request as ready for review January 20, 2026 15:30

hanabi1224 requested a review from a team as a code owner January 20, 2026 15:30

hanabi1224 requested review from LesnyRumcajs and akaladarshi and removed request for a team January 20, 2026 15:30

Merge branch 'main' into hm/reduce-repetitive-code

bd4fddc

LesnyRumcajs reviewed Jan 21, 2026

View reviewed changes

hanabi1224 added 2 commits January 21, 2026 21:28

more refactoring

1882931

Merge remote-tracking branch 'origin/main' into hm/reduce-repetitive-…

ea9a27d

…code

LesnyRumcajs reviewed Jan 22, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into hm/reduce-repetitive-…

f060b73

…code

LesnyRumcajs approved these changes Jan 23, 2026

View reviewed changes

hanabi1224 enabled auto-merge January 23, 2026 11:04

hanabi1224 added this pull request to the merge queue Jan 23, 2026

github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jan 23, 2026

hanabi1224 added this pull request to the merge queue Jan 23, 2026

Merged via the queue into main with commit b1b1a2c Jan 23, 2026
34 checks passed

hanabi1224 deleted the hm/reduce-repetitive-code branch January 23, 2026 12:27

This was referenced Jan 23, 2026

chore: more delegate_enum to reduce repetitive code #6474

Merged

chore: more delegate_enum to reduce repetitive code #6481

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: reduce repetitive code in enum match blocks#6453

fix: reduce repetitive code in enum match blocks#6453
hanabi1224 merged 5 commits intomainfrom
hm/reduce-repetitive-code

hanabi1224 commented Jan 20, 2026 •

edited by coderabbitai Bot

Loading

Uh oh!

coderabbitai Bot commented Jan 20, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Jan 20, 2026 •

edited

Loading

Uh oh!

LesnyRumcajs Jan 21, 2026

Uh oh!

hanabi1224 Jan 21, 2026

Uh oh!

LesnyRumcajs Jan 21, 2026

Uh oh!

LesnyRumcajs Jan 22, 2026

Uh oh!

hanabi1224 Jan 23, 2026

Uh oh!

LesnyRumcajs Jan 23, 2026

Uh oh!

hanabi1224 Jan 23, 2026 •

edited

Loading

Uh oh!

LesnyRumcajs Jan 23, 2026

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

hanabi1224 commented Jan 20, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of changes

Reference issue to close (if applicable)

Other information and links

Change checklist

Summary by CodeRabbit

Uh oh!

coderabbitai Bot commented Jan 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Sequence Diagram(s)

Estimated code review effort

Suggested reviewers

Uh oh!

codecov Bot commented Jan 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

LesnyRumcajs Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

hanabi1224 Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

LesnyRumcajs Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

LesnyRumcajs Jan 22, 2026

Choose a reason for hiding this comment

Uh oh!

hanabi1224 Jan 23, 2026

Choose a reason for hiding this comment

Uh oh!

LesnyRumcajs Jan 23, 2026

Choose a reason for hiding this comment

Uh oh!

hanabi1224 Jan 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

LesnyRumcajs Jan 23, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

hanabi1224 commented Jan 20, 2026 •

edited by coderabbitai Bot

Loading

coderabbitai Bot commented Jan 20, 2026 •

edited

Loading

codecov Bot commented Jan 20, 2026 •

edited

Loading

hanabi1224 Jan 23, 2026 •

edited

Loading