Skip to content

Commit

Permalink
extract VM trait to it's own crate (#1343)
Browse files Browse the repository at this point in the history
* extract VM trait to it's own crate

* prune vm_api depdendencies

* highlight TODO to prune fil_actors_runtime from the vm_api depdency

* tracking issue for dropping fil_actors_runtime
  • Loading branch information
alexytsu authored Jul 31, 2023
1 parent 1b282d4 commit ae4fa9a
Show file tree
Hide file tree
Showing 35 changed files with 2,380 additions and 2,216 deletions.
17 changes: 17 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ members = [
"state",
"runtime",
"test_vm",
"vm_api"
]

[workspace.dependencies]
Expand Down Expand Up @@ -140,6 +141,7 @@ fil_actor_verifreg = { version = "12.0.0", path = "actors/verifreg" }
fil_actors_evm_shared = { version = "12.0.0", path = "actors/evm/shared" }
fil_actors_runtime = { version = "12.0.0", path = "runtime" }
fil_builtin_actors_state = { version = "12.0.0", path = "state"}
vm_api = { version = "1.0.0", path = "vm_api" }

[patch.crates-io]
#fvm_shared = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
Expand Down
1 change: 1 addition & 0 deletions test_vm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ serde = { workspace = true }
thiserror = { workspace = true }
libsecp256k1 = { workspace = true }
fil_actors_evm_shared = { workspace = true }
vm_api = { workspace = true }

[dev-dependencies]
cid = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions test_vm/src/deals.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use crate::util::{apply_ok, serialize_ok};
use crate::VM;
use fil_actor_market::{
ClientDealProposal, DealProposal, Label, Method as MarketMethod, PublishStorageDealsParams,
PublishStorageDealsReturn,
Expand All @@ -15,6 +13,8 @@ use fvm_shared::econ::TokenAmount;
use fvm_shared::error::ExitCode;
use fvm_shared::piece::PaddedPieceSize;
use num_traits::Zero;
use vm_api::util::{apply_ok, serialize_ok};
use vm_api::VM;

#[derive(Clone)]
pub struct DealOptions {
Expand Down
2 changes: 1 addition & 1 deletion test_vm/src/expects.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ use fil_actors_runtime::{
VERIFIED_REGISTRY_ACTOR_ADDR,
};

use crate::trace::ExpectInvocation;
use vm_api::trace::ExpectInvocation;

/// Static helper functions for creating invocation expectations.
pub struct Expect {}
Expand Down
Loading

0 comments on commit ae4fa9a

Please sign in to comment.