refactor: update to fvm_ipld_{encoding|blockstore} (#189)

* refactor: update to fvm_ipld_{encoding|blockstore}

Ref filecoin-project/ref-fvm#434

Co-authored-by: Steven Allen <[email protected]>

Author: dignifiedquire

Cargo.lock

@@ -42,13 +42,14 @@ members = [
 ## Uncomment when working locally on ref-fvm and this repo simultaneously.
 ## Assumes the ref-fvm checkout is in a sibling directory with the same name.
 ## (Valid while FVM modules aren't published to crates.io)
-[patch."https://github.com/filecoin-project/ref-fvm"]
+#[patch."https://github.com/filecoin-project/ref-fvm"]
 #fvm_shared = { path = "../ref-fvm/shared" }
 #fvm_sdk = { path = "../ref-fvm/sdk" }
 #fvm_ipld_hamt = { path = "../ref-fvm/ipld/hamt" }
 #fvm_ipld_amt = { path = "../ref-fvm/ipld/amt" }
 #fvm_ipld_bitfield = { path = "../ref-fvm/ipld/bitfield"}
-#fvm_ipld_car = { path = "../ref-fvm/ipld/car"}
+#fvm_ipld_encoding = { path = "../ref-fvm/ipld/encoding"}
+#fvm_ipld_blockstore = { path = "../ref-fvm/ipld/blockstore"}
 
 ## Uncomment entries below when working locally on ref-fvm and this repo simultaneously.
 ## Assumes the ref-fvm checkout is in a sibling directory with the same name.
@@ -59,7 +60,8 @@ members = [
 #fvm_ipld_hamt = { path = "../ref-fvm/ipld/hamt" }
 #fvm_ipld_amt = { path = "../ref-fvm/ipld/amt" }
 #fvm_ipld_bitfield = { path = "../ref-fvm/ipld/bitfield"}
-#fvm_ipld_car = { path = "../ref-fvm/ipld/car"}
+#fvm_ipld_encoding = { path = "../ref-fvm/ipld/encoding"}
+#fvm_ipld_blockstore = { path = "../ref-fvm/ipld/blockstore"}
 
 [profile.wasm]
 inherits = "release"

Cargo.toml

@@ -14,10 +14,12 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["fil-actor"] }
-fvm_shared = { version = "0.3.1", default-features = false }
+fvm_shared = { version = "0.4.0", default-features = false }
 serde = { version = "1.0.136", features = ["derive"] }
 num-traits = "0.2.14"
 num-derive = "0.3.3"
+fvm_ipld_blockstore = { version = "0.1" }
+fvm_ipld_encoding = "0.1.0"
 
 [dev-dependencies]
 fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["test_utils", "sector-default"] }

actors/account/Cargo.toml

@@ -1,9 +1,9 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
+use fvm_ipld_blockstore::Blockstore;
+use fvm_ipld_encoding::RawBytes;
 use fvm_shared::address::{Address, Protocol};
-use fvm_shared::blockstore::Blockstore;
-use fvm_shared::encoding::RawBytes;
 use fvm_shared::{MethodNum, METHOD_CONSTRUCTOR};
 use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;

actors/account/src/lib.rs

@@ -1,9 +1,9 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
+use fvm_ipld_encoding::tuple::*;
+use fvm_ipld_encoding::Cbor;
 use fvm_shared::address::Address;
-use fvm_shared::encoding::tuple::*;
-use fvm_shared::encoding::Cbor;
 
 /// State includes the address for the actor
 #[derive(Serialize_tuple, Deserialize_tuple)]

actors/account/src/state.rs

@@ -4,8 +4,8 @@
 use fil_actor_account::{Actor as AccountActor, State};
 use fil_actors_runtime::builtin::SYSTEM_ACTOR_ADDR;
 use fil_actors_runtime::test_utils::*;
+use fvm_ipld_encoding::RawBytes;
 use fvm_shared::address::Address;
-use fvm_shared::encoding::RawBytes;
 use fvm_shared::error::ExitCode;
 
 macro_rules! account_tests {

actors/account/tests/account_actor_test.rs

@@ -15,11 +15,13 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["fil-actor"] }
-fvm_shared = { version = "0.3.1", default-features = false }
+fvm_shared = { version = "0.4.0", default-features = false }
 num-traits = "0.2.14"
 num-derive = "0.3.3"
 log = "0.4.14"
 serde = { version = "1.0.136", features = ["derive"] }
+fvm_ipld_blockstore = { version = "0.1" }
+fvm_ipld_encoding = "0.1.0"
 
 [dev-dependencies]
 fil_actors_runtime = { version = "8.0.0-alpha.1", path = "../runtime", features = ["test_utils", "sector-default"] }

actors/cron/Cargo.toml

@@ -3,10 +3,11 @@
 
 use fil_actors_runtime::runtime::{ActorCode, Runtime};
 use fil_actors_runtime::{actor_error, cbor, ActorError, SYSTEM_ACTOR_ADDR};
-use fvm_shared::blockstore::Blockstore;
+use fvm_ipld_blockstore::Blockstore;
+use fvm_ipld_encoding::tuple::*;
+use fvm_ipld_encoding::RawBytes;
 use fvm_shared::econ::TokenAmount;
-use fvm_shared::encoding::tuple::*;
-use fvm_shared::encoding::RawBytes;
+
 use fvm_shared::{MethodNum, METHOD_CONSTRUCTOR};
 use num_derive::FromPrimitive;
 use num_traits::FromPrimitive;

actors/cron/src/lib.rs

@@ -1,9 +1,9 @@
 // Copyright 2019-2022 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
+use fvm_ipld_encoding::tuple::*;
+use fvm_ipld_encoding::Cbor;
 use fvm_shared::address::Address;
-use fvm_shared::encoding::tuple::*;
-use fvm_shared::encoding::Cbor;
 use fvm_shared::MethodNum;
 
 /// Cron actor state which holds entries to call during epoch tick

actors/cron/src/state.rs

@@ -4,8 +4,8 @@
 use fil_actor_cron::{Actor as CronActor, ConstructorParams, Entry, State};
 use fil_actors_runtime::test_utils::*;
 use fil_actors_runtime::SYSTEM_ACTOR_ADDR;
+use fvm_ipld_encoding::RawBytes;
 use fvm_shared::address::Address;
-use fvm_shared::encoding::RawBytes;
 use fvm_shared::error::ExitCode;
 
 fn construct_runtime() -> MockRuntime {