Skip to content

Commit 3faab34

Browse files
lyswifterStebalien
lyswifter
authored and
Stebalien
committed
Replace actors cids to builtin.types in mockruntime (#629)
Co-authored-by: lyswifter <[email protected]>
1 parent 07bed12 commit 3faab34

18 files changed

+113
-108
lines changed

‎actors/market/tests/activate_deal_failures.rs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
use fil_actor_market::{ActivateDealsParams, Actor as MarketActor, Method};
55
use fil_actors_runtime::network::EPOCHS_IN_DAY;
6+
use fil_actors_runtime::runtime::builtins::Type;
67
use fil_actors_runtime::test_utils::*;
78
use fvm_ipld_encoding::RawBytes;
89
use fvm_shared::address::Address;
@@ -25,7 +26,7 @@ fn fail_when_caller_is_not_the_provider_of_the_deal() {
2526

2627
let params = ActivateDealsParams { deal_ids: vec![deal_id], sector_expiry };
2728

28-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
29+
rt.expect_validate_caller_type(vec![Type::Miner]);
2930
rt.set_caller(*MINER_ACTOR_CODE_ID, PROVIDER_ADDR);
3031
expect_abort(
3132
ExitCode::USR_FORBIDDEN,
@@ -39,7 +40,7 @@ fn fail_when_caller_is_not_the_provider_of_the_deal() {
3940
#[test]
4041
fn fail_when_caller_is_not_a_storage_miner_actor() {
4142
let mut rt = setup();
42-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
43+
rt.expect_validate_caller_type(vec![Type::Miner]);
4344
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, PROVIDER_ADDR);
4445

4546
let params = ActivateDealsParams { deal_ids: vec![], sector_expiry: 0 };
@@ -57,7 +58,7 @@ fn fail_when_deal_has_not_been_published_before() {
5758
let mut rt = setup();
5859
let params = ActivateDealsParams { deal_ids: vec![DealID::from(42u32)], sector_expiry: 0 };
5960

60-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
61+
rt.expect_validate_caller_type(vec![Type::Miner]);
6162
rt.set_caller(*MINER_ACTOR_CODE_ID, PROVIDER_ADDR);
6263
expect_abort(
6364
ExitCode::USR_NOT_FOUND,
@@ -84,7 +85,7 @@ fn fail_when_deal_has_already_been_activated() {
8485
);
8586
activate_deals(&mut rt, sector_expiry, PROVIDER_ADDR, 0, &[deal_id]);
8687

87-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
88+
rt.expect_validate_caller_type(vec![Type::Miner]);
8889
rt.set_caller(*MINER_ACTOR_CODE_ID, PROVIDER_ADDR);
8990
let params = ActivateDealsParams { deal_ids: vec![deal_id], sector_expiry };
9091
expect_abort(

‎actors/market/tests/compute_data_commitment.rs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use fil_actor_market::{
66
SectorDataSpec,
77
};
88
use fil_actors_runtime::network::EPOCHS_IN_DAY;
9+
use fil_actors_runtime::runtime::builtins::Type;
910
use fil_actors_runtime::test_utils::*;
1011
use fvm_ipld_encoding::RawBytes;
1112
use fvm_shared::error::ExitCode;
@@ -64,7 +65,7 @@ mod compute_data_commitment {
6465
ExitCode::OK,
6566
);
6667
rt.set_caller(*MINER_ACTOR_CODE_ID, PROVIDER_ADDR);
67-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
68+
rt.expect_validate_caller_type(vec![Type::Miner]);
6869

6970
let ret: ComputeDataCommitmentReturn = rt
7071
.call::<MarketActor>(
@@ -97,7 +98,7 @@ mod compute_data_commitment {
9798
ExitCode::OK,
9899
);
99100
rt.set_caller(*MINER_ACTOR_CODE_ID, PROVIDER_ADDR);
100-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
101+
rt.expect_validate_caller_type(vec![Type::Miner]);
101102

102103
let ret: ComputeDataCommitmentReturn = rt
103104
.call::<MarketActor>(
@@ -171,7 +172,7 @@ mod compute_data_commitment {
171172
ExitCode::OK,
172173
);
173174
rt.set_caller(*MINER_ACTOR_CODE_ID, PROVIDER_ADDR);
174-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
175+
rt.expect_validate_caller_type(vec![Type::Miner]);
175176

176177
let ret: ComputeDataCommitmentReturn = rt
177178
.call::<MarketActor>(
@@ -199,7 +200,7 @@ mod compute_data_commitment {
199200
};
200201
let param = ComputeDataCommitmentParams { inputs: vec![input] };
201202
rt.set_caller(*MINER_ACTOR_CODE_ID, PROVIDER_ADDR);
202-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
203+
rt.expect_validate_caller_type(vec![Type::Miner]);
203204
expect_abort(
204205
ExitCode::USR_NOT_FOUND,
205206
rt.call::<MarketActor>(
@@ -239,7 +240,7 @@ mod compute_data_commitment {
239240
ExitCode::USR_ILLEGAL_ARGUMENT,
240241
);
241242
rt.set_caller(*MINER_ACTOR_CODE_ID, PROVIDER_ADDR);
242-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
243+
rt.expect_validate_caller_type(vec![Type::Miner]);
243244
expect_abort(
244245
ExitCode::USR_ILLEGAL_ARGUMENT,
245246
rt.call::<MarketActor>(
@@ -285,7 +286,7 @@ mod compute_data_commitment {
285286
ExitCode::OK,
286287
); // first sector is computed
287288
rt.set_caller(*MINER_ACTOR_CODE_ID, PROVIDER_ADDR);
288-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
289+
rt.expect_validate_caller_type(vec![Type::Miner]);
289290
expect_abort(
290291
ExitCode::USR_NOT_FOUND,
291292
rt.call::<MarketActor>(
@@ -336,7 +337,7 @@ mod compute_data_commitment {
336337
ExitCode::USR_ILLEGAL_ARGUMENT,
337338
);
338339
rt.set_caller(*MINER_ACTOR_CODE_ID, PROVIDER_ADDR);
339-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
340+
rt.expect_validate_caller_type(vec![Type::Miner]);
340341
expect_abort(
341342
ExitCode::USR_ILLEGAL_ARGUMENT,
342343
rt.call::<MarketActor>(

‎actors/market/tests/cron_tick_timedout_deals.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ use fil_actor_market::{
77
};
88
use fil_actors_runtime::network::EPOCHS_IN_DAY;
99
use fil_actors_runtime::test_utils::*;
10-
use fil_actors_runtime::{BURNT_FUNDS_ACTOR_ADDR, VERIFIED_REGISTRY_ACTOR_ADDR};
10+
use fil_actors_runtime::{
11+
BURNT_FUNDS_ACTOR_ADDR, CALLER_TYPES_SIGNABLE, VERIFIED_REGISTRY_ACTOR_ADDR,
12+
};
1113
use fvm_ipld_encoding::RawBytes;
1214
use fvm_shared::clock::ChainEpoch;
1315
use fvm_shared::crypto::signature::Signature;
@@ -83,7 +85,7 @@ fn publishing_timed_out_deal_again_should_work_after_cron_tick_as_it_should_no_l
8385
let client_deal_proposal =
8486
ClientDealProposal { proposal: deal_proposal2.clone(), client_signature: sig.clone() };
8587
let params = PublishStorageDealsParams { deals: vec![client_deal_proposal] };
86-
rt.expect_validate_caller_type(vec![*ACCOUNT_ACTOR_CODE_ID, *MULTISIG_ACTOR_CODE_ID]);
88+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
8789
expect_provider_control_address(&mut rt, PROVIDER_ADDR, OWNER_ADDR, WORKER_ADDR);
8890
expect_query_network_info(&mut rt);
8991
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, WORKER_ADDR);

‎actors/market/tests/harness.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ use fil_actor_reward::Method as RewardMethod;
1919
use fil_actor_verifreg::UseBytesParams;
2020
use fil_actors_runtime::{
2121
network::EPOCHS_IN_DAY,
22-
runtime::{Policy, Runtime},
22+
runtime::{builtins::Type, Policy, Runtime},
2323
test_utils::*,
24-
ActorError, SetMultimap, BURNT_FUNDS_ACTOR_ADDR, CRON_ACTOR_ADDR, REWARD_ACTOR_ADDR,
25-
STORAGE_MARKET_ACTOR_ADDR, STORAGE_POWER_ACTOR_ADDR, SYSTEM_ACTOR_ADDR,
24+
ActorError, SetMultimap, BURNT_FUNDS_ACTOR_ADDR, CALLER_TYPES_SIGNABLE, CRON_ACTOR_ADDR,
25+
REWARD_ACTOR_ADDR, STORAGE_MARKET_ACTOR_ADDR, STORAGE_POWER_ACTOR_ADDR, SYSTEM_ACTOR_ADDR,
2626
VERIFIED_REGISTRY_ACTOR_ADDR,
2727
};
2828
use fvm_ipld_encoding::{to_vec, RawBytes};
@@ -156,7 +156,7 @@ pub fn add_provider_funds(rt: &mut MockRuntime, amount: TokenAmount, addrs: &Min
156156
rt.set_value(amount.clone());
157157
rt.set_address_actor_type(addrs.provider, *MINER_ACTOR_CODE_ID);
158158
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, addrs.owner);
159-
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).clone());
159+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
160160

161161
expect_provider_control_address(rt, addrs.provider, addrs.owner, addrs.worker);
162162

@@ -177,7 +177,7 @@ pub fn add_participant_funds(rt: &mut MockRuntime, addr: Address, amount: TokenA
177177

178178
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, addr);
179179

180-
rt.expect_validate_caller_type(vec![*ACCOUNT_ACTOR_CODE_ID, *MULTISIG_ACTOR_CODE_ID]);
180+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
181181

182182
assert!(rt
183183
.call::<MarketActor>(Method::AddBalance as u64, &RawBytes::serialize(addr).unwrap())
@@ -276,7 +276,7 @@ pub fn activate_deals_raw(
276276
deal_ids: &[DealID],
277277
) -> Result<RawBytes, ActorError> {
278278
rt.set_caller(*MINER_ACTOR_CODE_ID, provider);
279-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
279+
rt.expect_validate_caller_type(vec![Type::Miner]);
280280

281281
let params = ActivateDealsParams { deal_ids: deal_ids.to_vec(), sector_expiry };
282282

@@ -434,7 +434,7 @@ pub fn publish_deals(
434434
addrs: &MinerAddresses,
435435
publish_deals: &[DealProposal],
436436
) -> Vec<DealID> {
437-
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).clone());
437+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
438438

439439
let return_value = ext::miner::GetControlAddressesReturnParams {
440440
owner: addrs.owner,
@@ -516,7 +516,7 @@ pub fn publish_deals_expect_abort(
516516
proposal: DealProposal,
517517
expected_exit_code: ExitCode,
518518
) {
519-
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).clone());
519+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
520520
expect_provider_control_address(
521521
rt,
522522
miner_addresses.provider,
@@ -695,7 +695,7 @@ pub fn assert_deal_failure<F>(
695695
rt.set_epoch(current_epoch);
696696
post_setup(&mut rt, &mut deal_proposal);
697697

698-
rt.expect_validate_caller_type(vec![*ACCOUNT_ACTOR_CODE_ID, *MULTISIG_ACTOR_CODE_ID]);
698+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
699699
expect_provider_control_address(&mut rt, PROVIDER_ADDR, OWNER_ADDR, WORKER_ADDR);
700700
expect_query_network_info(&mut rt);
701701
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, WORKER_ADDR);
@@ -903,7 +903,7 @@ pub fn terminate_deals_raw(
903903
deal_ids: &[DealID],
904904
) -> Result<RawBytes, ActorError> {
905905
rt.set_caller(*MINER_ACTOR_CODE_ID, miner_addr);
906-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
906+
rt.expect_validate_caller_type(vec![Type::Miner]);
907907

908908
let params = OnMinerSectorsTerminateParams { epoch: rt.epoch, deal_ids: deal_ids.to_vec() };
909909

@@ -924,7 +924,7 @@ pub fn verify_deals_for_activation(
924924
sector_deals: Vec<SectorDeals>,
925925
) -> VerifyDealsForActivationReturn {
926926
let param = VerifyDealsForActivationParams { sectors: sector_deals };
927-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
927+
rt.expect_validate_caller_type(vec![Type::Miner]);
928928
rt.set_caller(*MINER_ACTOR_CODE_ID, provider);
929929

930930
let ret: VerifyDealsForActivationReturn = rt

‎actors/market/tests/market_actor_test.rs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ use fil_actor_market::{
1111
use fil_actor_verifreg::UseBytesParams;
1212
use fil_actors_runtime::cbor::deserialize;
1313
use fil_actors_runtime::network::EPOCHS_IN_DAY;
14-
use fil_actors_runtime::runtime::{Policy, Runtime};
14+
use fil_actors_runtime::runtime::{builtins::Type, Policy, Runtime};
1515
use fil_actors_runtime::test_utils::*;
1616
use fil_actors_runtime::{
17-
make_empty_map, ActorError, SetMultimap, BURNT_FUNDS_ACTOR_ADDR, SYSTEM_ACTOR_ADDR,
18-
VERIFIED_REGISTRY_ACTOR_ADDR,
17+
make_empty_map, ActorError, SetMultimap, BURNT_FUNDS_ACTOR_ADDR, CALLER_TYPES_SIGNABLE,
18+
SYSTEM_ACTOR_ADDR, VERIFIED_REGISTRY_ACTOR_ADDR,
1919
};
2020
use fvm_ipld_amt::Amt;
2121
use fvm_ipld_encoding::{to_vec, RawBytes};
@@ -192,7 +192,7 @@ fn adds_to_provider_escrow_funds() {
192192
for tc in &test_cases {
193193
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, *caller_addr);
194194
rt.set_value(TokenAmount::from_atto(tc.delta));
195-
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).clone());
195+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
196196
expect_provider_control_address(&mut rt, PROVIDER_ADDR, OWNER_ADDR, WORKER_ADDR);
197197

198198
assert_eq!(
@@ -369,7 +369,7 @@ fn fails_unless_called_by_an_account_actor() {
369369
let mut rt = setup();
370370

371371
rt.set_value(TokenAmount::from_atto(10));
372-
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).clone());
372+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
373373

374374
rt.set_caller(*MINER_ACTOR_CODE_ID, PROVIDER_ADDR);
375375
assert_eq!(
@@ -404,7 +404,7 @@ fn adds_to_non_provider_funds() {
404404
for tc in &test_cases {
405405
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, *caller_addr);
406406
rt.set_value(TokenAmount::from_atto(tc.delta));
407-
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).clone());
407+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
408408

409409
assert_eq!(
410410
RawBytes::default(),
@@ -748,7 +748,7 @@ fn provider_and_client_addresses_are_resolved_before_persisting_state_and_sent_t
748748
// add funds for provider using it's BLS address -> will be resolved and persisted
749749
rt.value_received = deal.provider_collateral.clone();
750750
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, OWNER_ADDR);
751-
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).clone());
751+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
752752
expect_provider_control_address(&mut rt, provider_resolved, OWNER_ADDR, WORKER_ADDR);
753753

754754
assert_eq!(
@@ -765,7 +765,7 @@ fn provider_and_client_addresses_are_resolved_before_persisting_state_and_sent_t
765765

766766
// publish deal using the BLS addresses
767767
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, WORKER_ADDR);
768-
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).clone());
768+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
769769

770770
expect_provider_control_address(&mut rt, provider_resolved, OWNER_ADDR, WORKER_ADDR);
771771
expect_query_network_info(&mut rt);
@@ -1282,7 +1282,7 @@ fn cannot_publish_the_same_deal_twice_before_a_cron_tick() {
12821282
let params = PublishStorageDealsParams {
12831283
deals: vec![ClientDealProposal { proposal: d2.clone(), client_signature: sig.clone() }],
12841284
};
1285-
rt.expect_validate_caller_type(vec![*ACCOUNT_ACTOR_CODE_ID, *MULTISIG_ACTOR_CODE_ID]);
1285+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
12861286
expect_provider_control_address(&mut rt, PROVIDER_ADDR, OWNER_ADDR, WORKER_ADDR);
12871287
expect_query_network_info(&mut rt);
12881288
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, WORKER_ADDR);
@@ -1318,7 +1318,7 @@ fn fail_when_current_epoch_greater_than_start_epoch_of_deal() {
13181318
end_epoch,
13191319
);
13201320

1321-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
1321+
rt.expect_validate_caller_type(vec![Type::Miner]);
13221322
rt.set_caller(*MINER_ACTOR_CODE_ID, PROVIDER_ADDR);
13231323
rt.set_epoch(start_epoch + 1);
13241324
let params = ActivateDealsParams { deal_ids: vec![deal_id], sector_expiry };
@@ -1345,7 +1345,7 @@ fn fail_when_end_epoch_of_deal_greater_than_sector_expiry() {
13451345
end_epoch,
13461346
);
13471347

1348-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
1348+
rt.expect_validate_caller_type(vec![Type::Miner]);
13491349
rt.set_caller(*MINER_ACTOR_CODE_ID, PROVIDER_ADDR);
13501350
let params = ActivateDealsParams { deal_ids: vec![deal_id], sector_expiry: end_epoch - 1 };
13511351
expect_abort(
@@ -1382,7 +1382,7 @@ fn fail_to_activate_all_deals_if_one_deal_fails() {
13821382
end_epoch + 1,
13831383
);
13841384

1385-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
1385+
rt.expect_validate_caller_type(vec![Type::Miner]);
13861386
rt.set_caller(*MINER_ACTOR_CODE_ID, PROVIDER_ADDR);
13871387
let params = ActivateDealsParams { deal_ids: vec![deal_id1, deal_id2], sector_expiry };
13881388
expect_abort(
@@ -1640,7 +1640,7 @@ fn insufficient_client_balance_in_a_batch() {
16401640
deal1.provider_balance_requirement().add(deal2.provider_balance_requirement());
16411641
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, OWNER_ADDR);
16421642
rt.set_value(provider_funds);
1643-
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).clone());
1643+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
16441644
expect_provider_control_address(&mut rt, PROVIDER_ADDR, OWNER_ADDR, WORKER_ADDR);
16451645

16461646
assert_eq!(
@@ -1671,7 +1671,7 @@ fn insufficient_client_balance_in_a_batch() {
16711671
],
16721672
};
16731673

1674-
rt.expect_validate_caller_type(vec![*ACCOUNT_ACTOR_CODE_ID, *MULTISIG_ACTOR_CODE_ID]);
1674+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
16751675
expect_provider_control_address(&mut rt, PROVIDER_ADDR, OWNER_ADDR, WORKER_ADDR);
16761676
expect_query_network_info(&mut rt);
16771677
rt.expect_verify_signature(ExpectedVerifySig {
@@ -1736,7 +1736,7 @@ fn insufficient_provider_balance_in_a_batch() {
17361736
// Provider has enough for only the second deal
17371737
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, OWNER_ADDR);
17381738
rt.set_value(deal2.provider_balance_requirement().clone());
1739-
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).clone());
1739+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
17401740
expect_provider_control_address(&mut rt, PROVIDER_ADDR, OWNER_ADDR, WORKER_ADDR);
17411741

17421742
assert_eq!(
@@ -1770,7 +1770,7 @@ fn insufficient_provider_balance_in_a_batch() {
17701770
],
17711771
};
17721772

1773-
rt.expect_validate_caller_type(vec![*ACCOUNT_ACTOR_CODE_ID, *MULTISIG_ACTOR_CODE_ID]);
1773+
rt.expect_validate_caller_type((*CALLER_TYPES_SIGNABLE).to_vec());
17741774
expect_provider_control_address(&mut rt, PROVIDER_ADDR, OWNER_ADDR, WORKER_ADDR);
17751775
expect_query_network_info(&mut rt);
17761776
rt.expect_verify_signature(ExpectedVerifySig {

‎actors/market/tests/on_miner_sectors_terminate.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use std::convert::TryInto;
55

66
use fil_actor_market::{Actor as MarketActor, Method, OnMinerSectorsTerminateParams};
77
use fil_actors_runtime::network::EPOCHS_IN_DAY;
8+
use fil_actors_runtime::runtime::builtins::Type;
89
use fil_actors_runtime::runtime::Policy;
910
use fil_actors_runtime::test_utils::*;
1011
use fvm_ipld_encoding::RawBytes;
@@ -298,7 +299,7 @@ fn do_not_terminate_deal_if_end_epoch_is_equal_to_or_less_than_current_epoch() {
298299
#[test]
299300
fn fail_when_caller_is_not_a_storage_miner_actor() {
300301
let mut rt = setup();
301-
rt.expect_validate_caller_type(vec![*MINER_ACTOR_CODE_ID]);
302+
rt.expect_validate_caller_type(vec![Type::Miner]);
302303
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, PROVIDER_ADDR);
303304
let params = OnMinerSectorsTerminateParams { epoch: rt.epoch, deal_ids: vec![] };
304305

0 commit comments

Comments
 (0)