Move CodeID and ActorState to vm crate

vm/Cargo.toml

@@ -9,3 +9,5 @@ num-bigint = { path = "../math/bigint", package = "forest_bigint" }
 address = { package = "forest_address", path = "./address" }
 encoding = { package = "forest_encoding", path = "../encoding" }
 serde = { version = "1.0", features = ["derive"] }
+cid = { package = "forest_cid", path = "../ipld/cid" }
+

vm/actor/src/builtin/init.rs

@@ -1,8 +1,9 @@
 // Copyright 2020 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use crate::{ActorID, CodeID};
-use vm::{ExitCode, MethodNum, Serialized, METHOD_CONSTRUCTOR, METHOD_PLACEHOLDER};
+use vm::{
+    ActorID, CodeID, ExitCode, MethodNum, Serialized, METHOD_CONSTRUCTOR, METHOD_PLACEHOLDER,
+};
 
 use address::Address;
 use num_derive::FromPrimitive;

vm/actor/src/lib.rs

@@ -2,41 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 mod builtin;
-mod code;
 
 pub use self::builtin::*;
-pub use self::code::*;
 use cid::Cid;
-use encoding::Cbor;
-use num_bigint::BigUint;
-use serde::{Deserialize, Serialize};
-
-/// Identifier for Actors, includes builtin and initialized actors
-#[derive(PartialEq, Eq, Copy, Clone, Debug, Default, Serialize, Deserialize)]
-pub struct ActorID(u64);
-
-impl Cbor for ActorID {}
-
-/// State of all actor implementations
-#[derive(PartialEq, Eq, Clone, Debug)]
-pub struct ActorState {
-    pub code_id: CodeID,
-    pub state: Cid,
-    pub balance: BigUint,
-    pub sequence: u64,
-}
-
-impl ActorState {
-    /// Constructor for actor state
-    pub fn new(code_id: CodeID, state: Cid, balance: BigUint, sequence: u64) -> Self {
-        Self {
-            code_id,
-            state,
-            balance,
-            sequence,
-        }
-    }
-}
 
 // TODO implement Actor for builtin actors on finished spec
 /// Actor trait which defines the common functionality of system Actors

vm/runtime/Cargo.toml

@@ -14,3 +14,4 @@ cid = { package = "forest_cid", path = "../../ipld/cid" }
 ipld_blockstore = { path = "../../ipld/blockstore" }
 clock = { path = "../../node/clock" }
 forest_encoding = { path = "../../encoding"}
+state_tree = { path = "../state_tree" }

vm/src/actor_state.rs

@@ -0,0 +1,35 @@
+// Copyright 2020 ChainSafe Systems
+// SPDX-License-Identifier: Apache-2.0, MIT
+
+use crate::CodeID;
+use cid::Cid;
+use encoding::Cbor;
+use num_bigint::BigUint;
+use serde::{Deserialize, Serialize};
+
+/// Identifier for Actors, includes builtin and initialized actors
+#[derive(PartialEq, Eq, Copy, Clone, Debug, Default, Serialize, Deserialize)]
+pub struct ActorID(pub u64);
+
+impl Cbor for ActorID {}
+
+/// State of all actor implementations
+#[derive(PartialEq, Eq, Clone, Debug)]
+pub struct ActorState {
+    pub code_id: CodeID,
+    pub state: Cid,
+    pub balance: BigUint,
+    pub sequence: u64,
+}
+
+impl ActorState {
+    /// Constructor for actor state
+    pub fn new(code_id: CodeID, state: Cid, balance: BigUint, sequence: u64) -> Self {
+        Self {
+            code_id,
+            state,
+            balance,
+            sequence,
+        }
+    }
+}

vm/src/lib.rs

@@ -1,11 +1,15 @@
 // Copyright 2020 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
+mod actor_state;
+mod code;
 mod exit_code;
 mod invoc;
 mod method;
 mod token;
 
+pub use self::actor_state::*;
+pub use self::code::*;
 pub use self::exit_code::*;
 pub use self::invoc::*;
 pub use self::method::*;

vm/state_tree/Cargo.toml

@@ -5,7 +5,6 @@ authors = ["ChainSafe Systems <info@chainsafe.io>"]
 edition = "2018"
 
 [dependencies]
-actor = { path = "../actor" }
 address = { package = "forest_address", path = "../address" }
 vm = { path = "../../vm" }
 cid = { package = "forest_cid", path = "../../ipld/cid" }

vm/state_tree/src/lib.rs

@@ -1,9 +1,9 @@
 // Copyright 2020 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use actor::ActorState;
 use address::Address;
 use std::collections::HashMap;
+use vm::ActorState;
 
 pub trait StateTree {
     fn get_actor(&self, addr: &Address) -> Option<ActorState>;
@@ -66,9 +66,9 @@ impl StateTree for HamtStateTree {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use actor::{ActorState, CodeID};
     use cid::Cid;
     use num_bigint::BigUint;
+    use vm::{ActorState, CodeID};
 
     #[test]
     fn get_set_cache() {