review changes

test_vm/src/lib.rs

@@ -74,7 +74,7 @@ impl TestVM {
 
         TestVM {
             primitives: FakePrimitives {},
-            store: store,
+            store,
             state_root: RefCell::new(actors.flush().unwrap()),
             circulating_supply: RefCell::new(TokenAmount::zero()),
             actors_dirty: RefCell::new(false),

test_vm/tests/suite/authenticate_message_test.rs

@@ -1,11 +1,10 @@
 use fil_actors_integration_tests::tests::account_authenticate_message_test;
 use fil_actors_runtime::test_blockstores::MemoryBlockstore;
-use std::rc::Rc;
 use test_vm::TestVM;
 
 #[test]
 fn account_authenticate_message() {
-    let store = Rc::new(MemoryBlockstore::new());
+    let store = MemoryBlockstore::new();
     let v = TestVM::new_with_singletons(store);
     account_authenticate_message_test(&v);
 }

test_vm/tests/suite/batch_onboarding.rs

@@ -1,6 +1,5 @@
 use fil_actors_integration_tests::tests::batch_onboarding_test;
 use fil_actors_runtime::test_blockstores::MemoryBlockstore;
-use std::rc::Rc;
 use test_case::test_case;
 use test_vm::TestVM;
 
@@ -9,7 +8,7 @@ use test_vm::TestVM;
 #[test_case(true; "v2")]
 fn batch_onboarding(v2: bool) {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
 
     batch_onboarding_test(&v, v2);
 }

test_vm/tests/suite/batch_onboarding_deals_test.rs

@@ -1,11 +1,10 @@
 use fil_actors_integration_tests::tests::batch_onboarding_deals_test;
 use fil_actors_runtime::test_blockstores::MemoryBlockstore;
-use std::rc::Rc;
 use test_vm::TestVM;
 
 #[test]
 fn batch_onboarding_deals() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     batch_onboarding_deals_test(&v);
 }

test_vm/tests/suite/change_beneficiary_test.rs

@@ -3,26 +3,25 @@ use fil_actors_integration_tests::tests::{
     change_beneficiary_success_test,
 };
 use fil_actors_runtime::test_blockstores::MemoryBlockstore;
-use std::rc::Rc;
 use test_vm::TestVM;
 
 #[test]
 fn change_beneficiary_success() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     change_beneficiary_success_test(&v);
 }
 
 #[test]
 fn change_beneficiary_back_owner_success() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     change_beneficiary_back_owner_success_test(&v);
 }
 
 #[test]
 fn change_beneficiary_fail() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     change_beneficiary_fail_test(&v);
 }

test_vm/tests/suite/change_owner_test.rs

@@ -2,26 +2,25 @@ use fil_actors_integration_tests::tests::{
     change_owner_fail_test, change_owner_success_test, keep_beneficiary_when_owner_changed_test,
 };
 use fil_actors_runtime::test_blockstores::MemoryBlockstore;
-use std::rc::Rc;
 use test_vm::TestVM;
 
 #[test]
 fn change_owner_success() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     change_owner_success_test(&v);
 }
 
 #[test]
 fn keep_beneficiary_when_owner_changed() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     keep_beneficiary_when_owner_changed_test(&v);
 }
 
 #[test]
 fn change_owner_fail() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     change_owner_fail_test(&v);
 }

test_vm/tests/suite/commit_post_test.rs

@@ -5,61 +5,59 @@ use fil_actors_integration_tests::tests::{
     submit_post_succeeds_test,
 };
 use fil_actors_runtime::test_blockstores::MemoryBlockstore;
-use std::rc::Rc;
 use test_vm::TestVM;
-
 #[test]
 fn submit_post_succeeds() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     submit_post_succeeds_test(&v);
 }
 
 #[test]
 fn skip_sector() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     skip_sector_test(&v);
 }
 
 #[test]
 fn missed_first_post_deadline() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     missed_first_post_deadline_test(&v);
 }
 
 #[test]
 fn overdue_precommit() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     overdue_precommit_test(&v);
 }
 
 #[test]
 fn aggregate_bad_sector_number() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     aggregate_bad_sector_number_test(&v);
 }
 
 #[test]
 fn aggregate_size_limits() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     aggregate_size_limits_test(&v);
 }
 
 #[test]
 fn aggregate_bad_sender() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     aggregate_bad_sender_test(&v);
 }
 
 #[test]
 fn aggregate_one_precommit_expires() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     aggregate_one_precommit_expires_test(&v);
 }

test_vm/tests/suite/datacap_tests.rs

@@ -1,20 +1,19 @@
 use fil_actors_integration_tests::tests::{call_name_symbol_test, datacap_transfer_test};
 use fil_actors_runtime::test_blockstores::MemoryBlockstore;
-use std::rc::Rc;
 use test_vm::TestVM;
 
 /* Mint a token for client and transfer it to a receiver, exercising error cases */
 #[test]
 fn datacap_transfer() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     datacap_transfer_test(&v);
 }
 
 /* Call name & symbol */
 #[test]
 fn call_name_symbol() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     call_name_symbol_test(&v);
 }

test_vm/tests/suite/evm_test.rs

@@ -4,60 +4,59 @@ use fil_actors_integration_tests::tests::{
     evm_staticcall_test,
 };
 use fil_actors_runtime::test_blockstores::MemoryBlockstore;
-use std::rc::Rc;
 use test_vm::TestVM;
 
 #[test]
 fn evm_call() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     evm_call_test(&v);
 }
 
 #[test]
 fn evm_create() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     evm_create_test(&v);
 }
 
 #[test]
 fn evm_eth_create_external() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     evm_eth_create_external_test(&v);
 }
 
 #[test]
 fn evm_empty_initcode() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     evm_empty_initcode_test(&v);
 }
 #[test]
 fn evm_staticcall() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     evm_staticcall_test(&v);
 }
 
 #[test]
 fn evm_delegatecall() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     evm_delegatecall_test(&v);
 }
 
 #[test]
 fn evm_staticcall_delegatecall() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     evm_staticcall_delegatecall_test(&v);
 }
 
 #[test]
 fn evm_init_revert_data() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     evm_init_revert_data_test(&v);
 }

test_vm/tests/suite/extend_sectors_test.rs

@@ -3,40 +3,39 @@ use fil_actors_integration_tests::tests::{
     extend_sector_up_to_max_relative_extension_test, extend_updated_sector_with_claims_test,
 };
 use fil_actors_runtime::test_blockstores::MemoryBlockstore;
-use std::rc::Rc;
 use test_vm::TestVM;
 
 #[test]
 fn extend_legacy_sector_with_deals() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     extend_legacy_sector_with_deals_test(&v, false);
 }
 
 #[test]
 fn extend2_legacy_sector_with_deals() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     extend_legacy_sector_with_deals_test(&v, true);
 }
 
 #[test]
 fn extend_updated_sector_with_claim() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     extend_updated_sector_with_claims_test(&v);
 }
 
 #[test]
 fn extend_sector_up_to_max_relative_extension() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     extend_sector_up_to_max_relative_extension_test(&v);
 }
 
 #[test]
 fn commit_sector_with_max_duration_deal() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
     commit_sector_with_max_duration_deal_test(&v);
 }

test_vm/tests/suite/init_test.rs

@@ -1,12 +1,11 @@
 use fil_actors_integration_tests::tests::placeholder_deploy_test;
 use fil_actors_runtime::test_blockstores::MemoryBlockstore;
-use std::rc::Rc;
 use test_vm::TestVM;
 
 #[test]
 fn placeholder_deploy() {
     let store = MemoryBlockstore::new();
-    let v = TestVM::new_with_singletons(Rc::new(store));
+    let v = TestVM::new_with_singletons(store);
 
     placeholder_deploy_test(&v);
 }