Drop unnecessary changes from next (#1207)

arajasek · web-flow · commit 2b8597195ab3 · 2023-02-10T17:00:04.000-05:00
Drop unnecsseray changes from next
diff --git a/Cargo.toml b/Cargo.toml
@@ -40,18 +40,22 @@ num-traits = "0.2.15"
 clap = { version = "3.2.3", features = ["derive"] }
 
 [features]
-default = []             ## translates to mainnet
+default = [] ## translates to mainnet
 mainnet = []
 caterpillarnet = []
 butterflynet = []
 calibrationnet = []
 devnet = []
 testing = []
 testing-fake-proofs = []
-m2-native = []
 
 [workspace]
-members = ["actors/*", "state", "runtime", "test_vm", "actors/evm/shared"]
+members = [
+     "actors/*",
+     "state",
+     "runtime",
+     "test_vm",
+]
 
 [patch.crates-io]
 #fvm_shared = { git = "https://github.com/filecoin-project/ref-fvm", branch = "master" }
@@ -72,20 +76,18 @@ members = ["actors/*", "state", "runtime", "test_vm", "actors/evm/shared"]
 #fvm_shared = { path = "../ref-fvm/shared" }
 #fvm_sdk = { path = "../ref-fvm/sdk" }
 #fvm_ipld_hamt = { path = "../ref-fvm/ipld/hamt" }
-#fvm_ipld_kamt = { path = "../ref-fvm/ipld/kamt" }
 #fvm_ipld_amt = { path = "../ref-fvm/ipld/amt" }
 #fvm_ipld_bitfield = { path = "../ref-fvm/ipld/bitfield"}
 #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.
-# (Valid once FVM modules are published to crates.io)
+## 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.
+## (Valid once FVM modules are published to crates.io)
 # [patch.crates-io]
 # fvm_shared = { path = "../ref-fvm/shared" }
 # fvm_sdk = { path = "../ref-fvm/sdk" }
 # fvm_ipld_hamt = { path = "../ref-fvm/ipld/hamt" }
-# fvm_ipld_kamt = { path = "../ref-fvm/ipld/kamt" }
 # fvm_ipld_amt = { path = "../ref-fvm/ipld/amt" }
 # fvm_ipld_bitfield = { path = "../ref-fvm/ipld/bitfield"}
 # fvm_ipld_encoding = { path = "../ref-fvm/ipld/encoding"}
diff --git a/actors/datacap/Cargo.toml b/actors/datacap/Cargo.toml
@@ -34,3 +34,4 @@ log = "0.4.14"
 fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
 [features]
 fil-actor = ["fil_actors_runtime/fil-actor"]
+
diff --git a/actors/datacap/src/lib.rs b/actors/datacap/src/lib.rs
@@ -13,7 +13,8 @@ use fvm_shared::address::Address;
 use fvm_shared::bigint::BigInt;
 use fvm_shared::econ::TokenAmount;
 use fvm_shared::error::{ErrorNumber, ExitCode};
-use fvm_shared::{ActorID, MethodNum, Response, METHOD_CONSTRUCTOR};
+use fvm_shared::Response;
+use fvm_shared::{ActorID, MethodNum, METHOD_CONSTRUCTOR};
 use lazy_static::lazy_static;
 use log::info;
 use num_derive::FromPrimitive;
diff --git a/actors/eam/src/ext.rs b/actors/eam/src/ext.rs
@@ -4,6 +4,7 @@ use fvm_ipld_encoding::RawBytes;
 use fvm_shared::address::Address;
 
 pub mod init {
+
     use super::*;
 
     pub const EXEC4_METHOD: u64 = 3;
@@ -28,7 +29,6 @@ pub mod init {
 
 pub mod evm {
     use super::*;
-
     use fil_actors_evm_shared::address::EthAddress;
 
     #[derive(Serialize_tuple, Deserialize_tuple, Clone)]
diff --git a/actors/init/Cargo.toml b/actors/init/Cargo.toml
@@ -28,7 +28,7 @@ fvm_ipld_blockstore = "0.1.1"
 fvm_ipld_encoding = "0.3.3"
 
 [dev-dependencies]
-fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
 
 [features]
 fil-actor = ["fil_actors_runtime/fil-actor"]
diff --git a/actors/market/Cargo.toml b/actors/market/Cargo.toml
@@ -33,7 +33,7 @@ num-traits = "0.2.14"
 serde = { version = "1.0.136", features = ["derive"] }
 
 [dev-dependencies]
-fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
 fil_actor_power = { path = "../power" }
 fil_actor_reward = { path = "../reward" }
 fil_actor_verifreg = { path = "../verifreg" }
diff --git a/actors/miner/src/state.rs b/actors/miner/src/state.rs
@@ -1207,7 +1207,7 @@ pub struct AdvanceDeadlineResult {
 }
 
 /// Static information about miner
-#[derive(Debug, Eq, PartialEq, Serialize_tuple, Deserialize_tuple)]
+#[derive(Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]
 pub struct MinerInfo {
     /// Account that owns this miner
     /// - Income and returned collateral are paid to this address
diff --git a/actors/miner/tests/change_beneficiary_test.rs b/actors/miner/tests/change_beneficiary_test.rs
@@ -7,7 +7,6 @@ use fvm_shared::{address::Address, econ::TokenAmount, error::ExitCode, MethodNum
 use num_traits::Zero;
 
 mod util;
-
 use util::*;
 
 fn setup() -> (ActorHarness, MockRuntime) {
diff --git a/actors/miner/tests/miner_actor_test_peer_info.rs b/actors/miner/tests/miner_actor_test_peer_info.rs
@@ -128,6 +128,7 @@ fn get_and_change_multiaddrs_restricted_correctly() {
     .unwrap();
 
     rt.set_caller(*EVM_ACTOR_CODE_ID, h.worker);
+
     // fail to call the unexported setter
 
     expect_abort_contains_message(
diff --git a/actors/power/Cargo.toml b/actors/power/Cargo.toml
@@ -31,7 +31,7 @@ fvm_ipld_blockstore = "0.1.1"
 fvm_ipld_encoding = "0.3.3"
 
 [dev-dependencies]
-fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
 fil_actor_reward = { path = "../reward" }
 
 [features]
diff --git a/actors/power/src/types.rs b/actors/power/src/types.rs
@@ -64,7 +64,7 @@ pub struct UpdatePledgeTotalParams {
     pub pledge_delta: TokenAmount,
 }
 
-#[derive(Serialize_tuple, Deserialize_tuple, Debug, Clone, PartialEq, Eq)]
+#[derive(Serialize_tuple, Deserialize_tuple, Debug, Clone, Eq, PartialEq)]
 pub struct CurrentTotalPowerReturn {
     #[serde(with = "bigint_ser")]
     pub raw_byte_power: StoragePower,
diff --git a/actors/verifreg/Cargo.toml b/actors/verifreg/Cargo.toml
@@ -14,7 +14,7 @@ keywords = ["filecoin", "web3", "wasm"]
 crate-type = ["cdylib", "lib"]
 
 [dependencies]
-fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime" }
+fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime"}
 
 anyhow = "1.0.65"
 cid = { version = "0.8.3", default-features = false, features = ["serde-codec"] }
@@ -32,7 +32,7 @@ num-traits = "0.2.14"
 serde = { version = "1.0.136", features = ["derive"] }
 
 [dev-dependencies]
-fil_actors_runtime = { path = "../../runtime", features = ["test_utils", "sector-default"] }
+fil_actors_runtime = { version = "10.0.0-alpha.1", path = "../../runtime", features = ["test_utils", "sector-default"] }
 
 [features]
 fil-actor = ["fil_actors_runtime/fil-actor"]
diff --git a/runtime/src/actor_error.rs b/runtime/src/actor_error.rs
@@ -73,6 +73,7 @@ impl ActorError {
     pub fn assertion_failed(msg: String) -> Self {
         Self { exit_code: ExitCode::USR_ASSERTION_FAILED, msg, data: None }
     }
+
     pub fn read_only(msg: String) -> Self {
         Self { exit_code: ExitCode::USR_READ_ONLY, msg, data: None }
     }
diff --git a/runtime/src/runtime/fvm.rs b/runtime/src/runtime/fvm.rs
@@ -4,6 +4,8 @@ use cid::Cid;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::ipld_block::IpldBlock;
 use fvm_ipld_encoding::CborStore;
+#[cfg(feature = "fake-proofs")]
+use fvm_ipld_encoding::RawBytes;
 use fvm_sdk as fvm;
 use fvm_sdk::NO_DATA_BLOCK_ID;
 use fvm_shared::address::{Address, Payload};
@@ -508,7 +510,7 @@ where
 
         hasher.update(info.randomness.0);
         for si in info.challenged_sectors {
-            hasher.update(fvm_ipld_encoding::RawBytes::serialize(si)?.bytes());
+            hasher.update(RawBytes::serialize(si)?.bytes());
         }
 
         let expected_proof = hasher.finalize();
diff --git a/runtime/src/runtime/mod.rs b/runtime/src/runtime/mod.rs
@@ -5,15 +5,13 @@ use cid::Cid;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::CborStore;
 use fvm_shared::address::Address;
-use fvm_shared::chainid::ChainID;
 use fvm_shared::clock::ChainEpoch;
 use fvm_shared::consensus::ConsensusFault;
 use fvm_shared::crypto::hash::SupportedHashes;
 use fvm_shared::crypto::signature::{
     Signature, SECP_PUB_LEN, SECP_SIG_LEN, SECP_SIG_MESSAGE_HASH_SIZE,
 };
 use fvm_shared::econ::TokenAmount;
-use fvm_shared::event::ActorEvent;
 use fvm_shared::piece::PieceInfo;
 use fvm_shared::randomness::RANDOMNESS_LENGTH;
 use fvm_shared::sector::{
@@ -47,6 +45,8 @@ pub(crate) mod empty;
 
 pub use empty::EMPTY_ARR_CID;
 use fvm_ipld_encoding::ipld_block::IpldBlock;
+use fvm_shared::chainid::ChainID;
+use fvm_shared::event::ActorEvent;
 use fvm_shared::sys::SendFlags;
 use multihash::Code;
 
diff --git a/runtime/src/runtime/policy.rs b/runtime/src/runtime/policy.rs
@@ -284,8 +284,8 @@ pub mod policy_constants {
     /// The period over which all a miner's active sectors will be challenged.
     pub const WPOST_PROVING_PERIOD: ChainEpoch = EPOCHS_IN_DAY;
     /// The duration of a deadline's challenge window, the period before a deadline when the challenge is available.
-    pub const WPOST_CHALLENGE_WINDOW: ChainEpoch = 30 * 60 / EPOCH_DURATION_SECONDS;
     // Half an hour (=48 per day)
+    pub const WPOST_CHALLENGE_WINDOW: ChainEpoch = 30 * 60 / EPOCH_DURATION_SECONDS;
     /// The number of non-overlapping PoSt deadlines in each proving period.
     pub const WPOST_PERIOD_DEADLINES: u64 = 48;
     /// The maximum distance back that a valid Window PoSt must commit to the current chain.
diff --git a/runtime/src/test_utils.rs b/runtime/src/test_utils.rs
@@ -12,8 +12,8 @@ use cid::Cid;
 use fvm_ipld_blockstore::{Blockstore, MemoryBlockstore};
 use fvm_ipld_encoding::de::DeserializeOwned;
 use fvm_ipld_encoding::CborStore;
-use fvm_shared::address::{Address, Payload, Protocol};
-use fvm_shared::chainid::ChainID;
+use fvm_shared::address::Payload;
+use fvm_shared::address::{Address, Protocol};
 use fvm_shared::clock::ChainEpoch;
 use fvm_shared::commcid::{FIL_COMMITMENT_SEALED, FIL_COMMITMENT_UNSEALED};
 use fvm_shared::consensus::ConsensusFault;
@@ -44,10 +44,11 @@ use crate::runtime::{
     Verifier, EMPTY_ARR_CID,
 };
 use crate::{actor_error, ActorError, SendError};
-use fvm_shared::event::ActorEvent;
 use libsecp256k1::{recover, Message, RecoveryId, Signature as EcsdaSignature};
 
 use fvm_ipld_encoding::ipld_block::IpldBlock;
+use fvm_shared::chainid::ChainID;
+use fvm_shared::event::ActorEvent;
 use fvm_shared::sys::SendFlags;
 
 lazy_static::lazy_static! {
@@ -67,6 +68,7 @@ lazy_static::lazy_static! {
     pub static ref EVM_ACTOR_CODE_ID: Cid = make_identity_cid(b"fil/test/evm");
     pub static ref EAM_ACTOR_CODE_ID: Cid = make_identity_cid(b"fil/test/eam");
     pub static ref ETHACCOUNT_ACTOR_CODE_ID: Cid = make_identity_cid(b"fil/test/ethaccount");
+
     pub static ref ACTOR_TYPES: BTreeMap<Cid, Type> = {
         let mut map = BTreeMap::new();
         map.insert(*SYSTEM_ACTOR_CODE_ID, Type::System);
@@ -107,8 +109,6 @@ lazy_static::lazy_static! {
     ]
     .into_iter()
     .collect();
-    // TODO this is the other way around and will not work for wasm actors; the singletons must
-    //      be in a map, not the nonsingletons .
     pub static ref NON_SINGLETON_CODES: BTreeMap<Cid, ()> = {
         let mut map = BTreeMap::new();
         map.insert(*ACCOUNT_ACTOR_CODE_ID, ());
@@ -317,10 +317,6 @@ impl Expectations {
             this.expect_emitted_events
         );
     }
-
-    fn skip_verification_on_drop(&mut self) {
-        self.skip_verification_on_drop = true;
-    }
 }
 
 impl Default for MockRuntime {
@@ -567,14 +563,13 @@ impl<BS: Blockstore> MockRuntime<BS> {
         res
     }
 
-    /// Verifies that all mock expectations have been met.
+    /// Verifies that all mock expectations have been met (and resets the expectations).
     pub fn verify(&mut self) {
         self.expectations.borrow_mut().verify()
     }
 
     /// Clears all mock expectations.
     pub fn reset(&mut self) {
-        self.expectations.borrow_mut().skip_verification_on_drop();
         self.expectations.borrow_mut().reset();
     }
 
diff --git a/runtime/src/util/chaos/mod.rs b/runtime/src/util/chaos/mod.rs
diff --git a/test_vm/src/lib.rs b/test_vm/src/lib.rs
diff --git a/test_vm/tests/test_vm_test.rs b/test_vm/tests/test_vm_test.rs

Original file line number	Diff line number	Diff line change
`@@ -1207,7 +1207,7 @@ pub struct AdvanceDeadlineResult {`
`1207`	`1207`	`}`
`1208`	`1208`
`1209`	`1209`	`/// Static information about miner`
`1210`		`-#[derive(Debug, Eq, PartialEq, Serialize_tuple, Deserialize_tuple)]`
	`1210`	`+#[derive(Debug, PartialEq, Eq, Serialize_tuple, Deserialize_tuple)]`
`1211`	`1211`	`pub struct MinerInfo {`
`1212`	`1212`	`/// Account that owns this miner`
`1213`	`1213`	`/// - Income and returned collateral are paid to this address`