Skip to content

Commit 68e18aa

Browse files
committed
chore: address review comments
1 parent 8e7f19b commit 68e18aa

File tree

4 files changed

+17
-10
lines changed

4 files changed

+17
-10
lines changed

actors/miner/tests/miner_actor_test_construction.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use fvm_ipld_encoding::ipld_block::IpldBlock;
2121
use num_traits::{FromPrimitive, Zero};
2222

2323
mod util;
24-
use util::minimum_initial_pledge;
24+
use util::create_miner_deposit_for_test;
2525

2626
#[allow(dead_code)]
2727
struct TestEnv {
@@ -65,7 +65,11 @@ fn prepare_env() -> TestEnv {
6565
env.rt.caller.replace(INIT_ACTOR_ADDR);
6666
env.rt.caller_type.replace(*INIT_ACTOR_CODE_ID);
6767
// add balance for create miner deposit
68-
env.rt.add_balance(minimum_initial_pledge(&env.rt, &env.power, &env.epoch_reward_smooth));
68+
env.rt.add_balance(create_miner_deposit_for_test(
69+
&env.rt,
70+
&env.power,
71+
&env.epoch_reward_smooth,
72+
));
6973
env
7074
}
7175

@@ -139,7 +143,7 @@ fn simple_construction() {
139143

140144
assert_eq!(TokenAmount::zero(), state.pre_commit_deposits);
141145
assert_eq!(
142-
minimum_initial_pledge(&env.rt, &env.power, &env.epoch_reward_smooth),
146+
create_miner_deposit_for_test(&env.rt, &env.power, &env.epoch_reward_smooth),
143147
state.locked_funds
144148
);
145149
assert_eq!(180, state.vesting_funds.load(&env.rt.store).unwrap().len());

actors/miner/tests/util.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ pub fn setup() -> (ActorHarness, MockRuntime) {
133133
(h, rt)
134134
}
135135

136-
pub fn minimum_initial_pledge(
136+
pub fn create_miner_deposit_for_test(
137137
rt: &MockRuntime,
138138
baseline_power: &StoragePower,
139139
reward_estimated: &FilterEstimate,
@@ -241,7 +241,7 @@ impl ActorHarness {
241241

242242
pub fn check_create_miner_deposit_and_reset_state(&self, rt: &MockRuntime) {
243243
let create_deposit =
244-
minimum_initial_pledge(rt, &self.baseline_power, &self.epoch_reward_smooth);
244+
create_miner_deposit_for_test(rt, &self.baseline_power, &self.epoch_reward_smooth);
245245

246246
let mut st = self.get_state(&rt);
247247
let create_deposit_vesting_funds = st.vesting_funds.load(&rt.store).unwrap();
@@ -313,7 +313,11 @@ impl ActorHarness {
313313

314314
// set circulating supply non-zero so we get non-zero fees
315315
rt.set_circulating_supply(TokenAmount::from_whole(500_000));
316-
rt.add_balance(minimum_initial_pledge(rt, &self.baseline_power, &self.epoch_reward_smooth));
316+
rt.add_balance(create_miner_deposit_for_test(
317+
rt,
318+
&self.baseline_power,
319+
&self.epoch_reward_smooth,
320+
));
317321
rt.set_caller(*INIT_ACTOR_CODE_ID, INIT_ACTOR_ADDR);
318322
rt.expect_validate_caller_addr(vec![INIT_ACTOR_ADDR]);
319323
rt.expect_send_simple(

integration_tests/src/util/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ use crate::{MinerBalances, NetworkStats, TEST_FAUCET_ADDR};
4444
mod workflows;
4545

4646
const ACCOUNT_SEED: u64 = 93837778;
47-
pub const CREATE_MINER_DEPOSIT: u128 = 319999994978159820800;
4847

4948
/// Returns addresses of created accounts in ID format
5049
pub fn create_accounts(v: &dyn VM, count: u64, balance: &TokenAmount) -> Vec<Address> {
@@ -289,7 +288,7 @@ pub fn get_network_stats(vm: &dyn VM) -> NetworkStats {
289288
}
290289
}
291290

292-
pub fn get_minimum_initial_pledge(vm: &dyn VM) -> TokenAmount {
291+
pub fn create_miner_deposit_for_test(vm: &dyn VM) -> TokenAmount {
293292
let power_state: PowerState = get_state(vm, &STORAGE_POWER_ACTOR_ADDR).unwrap();
294293
let reward_state: RewardState = get_state(vm, &REWARD_ACTOR_ADDR).unwrap();
295294

integration_tests/src/util/workflows.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ use vm_api::util::{apply_code, apply_ok, apply_ok_implicit};
8585
use crate::expects::Expect;
8686
use crate::*;
8787

88-
use super::get_minimum_initial_pledge;
88+
use super::create_miner_deposit_for_test;
8989
use super::market_pending_deal_allocations_raw;
9090
use super::miner_dline_info;
9191
use super::sector_deadline;
@@ -102,7 +102,7 @@ pub fn cron_tick(v: &dyn VM) {
102102
}
103103

104104
pub fn owner_add_create_miner_deposit(v: &dyn VM, owner: &Address) -> TokenAmount {
105-
let create_miner_deposit = get_minimum_initial_pledge(v);
105+
let create_miner_deposit = create_miner_deposit_for_test(v);
106106
apply_ok(
107107
v,
108108
&TEST_FAUCET_ADDR,

0 commit comments

Comments
 (0)