Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update VM trait #1340

Merged
merged 7 commits into from
Jul 31, 2023
Merged

Update VM trait #1340

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4722875
update VM trait to align with anorth/fvm-workbench
alexytsu Jul 24, 2023
6dbcb5f
update tests to check invariants on the concrete types
alexytsu Jul 24, 2023
9d46a24
Revert "update tests to check invariants on the concrete types"
alexytsu Jul 25, 2023
56c231f
wip
alexytsu Jul 26, 2023
97b837d
extract policy out of VM trait
alexytsu Jul 27, 2023
be81a07
add set circulating supply onto the trait
alexytsu Jul 27, 2023
76c83cf
use static builtin-actors manifest
alexytsu Jul 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions state/src/check.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::collections::BTreeMap;
use std::collections::HashMap;
use std::fmt::Debug;

use anyhow::bail;
use bimap::BiBTreeMap;
use cid::Cid;
use fil_actor_account::State as AccountState;
use fil_actor_cron::State as CronState;
Expand Down Expand Up @@ -114,7 +114,7 @@ macro_rules! get_state {
// It could be replaced with a custom mapping trait (while Rust doesn't support
// abstract collection traits).
pub fn check_state_invariants<BS: Blockstore>(
manifest: &BiBTreeMap<Cid, Type>,
manifest: &BTreeMap<Cid, Type>,
policy: &Policy,
tree: Tree<'_, BS>,
expected_balance_total: &TokenAmount,
Expand Down Expand Up @@ -143,7 +143,7 @@ pub fn check_state_invariants<BS: Blockstore>(
}
total_fil += &actor.balance;

match manifest.get_by_left(&actor.code) {
match manifest.get(&actor.code) {
Some(Type::System) => (),
Some(Type::Init) => {
let state = get_state!(tree, actor, InitState);
Expand Down
Loading