Skip to content

Commit f32e7fd

Browse files
anorthanorth
authored
Fixes to mock runtime (#246)
1 parent 5921189 commit f32e7fd

File tree

15 files changed

+162
-169
lines changed

15 files changed

+162
-169
lines changed

‎actors/account/tests/account_actor_test.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ macro_rules! account_tests {
2626
if exit_code.is_success() {
2727
rt.call::<AccountActor>(1, &RawBytes::serialize(addr).unwrap()).unwrap();
2828

29-
let state: State = rt.get_state().unwrap();
29+
let state: State = rt.get_state();
3030
assert_eq!(state.address, addr);
3131
rt.expect_validate_caller_any();
3232

‎actors/cron/tests/cron_actor_test.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn construct_with_empty_entries() {
2121
let mut rt = construct_runtime();
2222

2323
construct_and_verify(&mut rt, &ConstructorParams { entries: vec![] });
24-
let state: State = rt.get_state().unwrap();
24+
let state: State = rt.get_state();
2525

2626
assert_eq!(state.entries, vec![]);
2727
}
@@ -39,7 +39,7 @@ fn construct_with_entries() {
3939

4040
construct_and_verify(&mut rt, &params);
4141

42-
let state: State = rt.get_state().unwrap();
42+
let state: State = rt.get_state();
4343

4444
assert_eq!(state.entries, params.entries);
4545
}

‎actors/init/tests/init_actor_test.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ fn create_2_payment_channels() {
8080
assert_eq!(unique_address, exec_ret.robust_address, "Robust Address does not match");
8181
assert_eq!(expected_id_addr, exec_ret.id_address, "Id address does not match");
8282

83-
let state: State = rt.get_state().unwrap();
83+
let state: State = rt.get_state();
8484
let returned_address = state
8585
.resolve_address(&rt.store, &unique_address)
8686
.expect("Resolve should not error")
@@ -123,7 +123,7 @@ fn create_storage_miner() {
123123
assert_eq!(expected_id_addr, exec_ret.id_address);
124124

125125
// Address should be resolved
126-
let state: State = rt.get_state().unwrap();
126+
let state: State = rt.get_state();
127127
let returned_address = state
128128
.resolve_address(&rt.store, &unique_address)
129129
.expect("Resolve should not error")
@@ -211,7 +211,7 @@ fn sending_constructor_failure() {
211211
"Exit Code that is returned is not ErrIllegalState"
212212
);
213213

214-
let state: State = rt.get_state().unwrap();
214+
let state: State = rt.get_state();
215215

216216
let returned_address = state.resolve_address(&rt.store, &unique_address).unwrap();
217217
assert_eq!(returned_address, None, "Addresses should have not been found");
@@ -226,7 +226,7 @@ fn construct_and_verify(rt: &mut MockRuntime) {
226226
assert_eq!(RawBytes::default(), ret);
227227
rt.verify();
228228

229-
let state_data: State = rt.get_state().unwrap();
229+
let state_data: State = rt.get_state();
230230

231231
// Gets the Result(CID)
232232
let empty_map =

‎actors/market/tests/market_actor_test.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fn setup() -> MockRuntime {
4848
}
4949

5050
fn get_escrow_balance(rt: &MockRuntime, addr: &Address) -> Result<TokenAmount, ActorError> {
51-
let st: State = rt.get_state()?;
51+
let st: State = rt.get_state();
5252

5353
let et = BalanceTable::from_root(rt.store(), &st.escrow_table).unwrap();
5454

@@ -85,7 +85,7 @@ fn simple_construction() {
8585
Amt::<(), _>::new_with_bit_width(store, STATES_AMT_BITWIDTH).flush().unwrap();
8686
let empty_multimap = SetMultimap::new(store).root().unwrap();
8787

88-
let state_data: State = rt.get_state().unwrap();
88+
let state_data: State = rt.get_state();
8989

9090
assert_eq!(empty_proposals_array, state_data.proposals);
9191
assert_eq!(empty_states_array, state_data.states);

‎actors/miner/tests/miner_actor_test_construction.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ fn simple_construction() {
8484
assert_eq!(result.bytes().len(), 0);
8585
env.rt.verify();
8686

87-
let state = env.rt.get_state::<State>().unwrap();
87+
let state = env.rt.get_state::<State>();
8888

8989
let info = state.get_info(&env.rt.store).unwrap();
9090
assert_eq!(env.owner, info.owner);
@@ -157,7 +157,7 @@ fn control_addresses_are_resolved_during_construction() {
157157
assert_eq!(result.bytes().len(), 0);
158158
env.rt.verify();
159159

160-
let state = env.rt.get_state::<State>().unwrap();
160+
let state: State = env.rt.get_state();
161161
let info = state.get_info(&env.rt.store).unwrap();
162162

163163
assert_eq!(2, info.control_addresses.len());

‎actors/miner/tests/util.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ impl ActorHarness {
125125
}
126126

127127
pub fn get_state(&self, rt: &MockRuntime) -> State {
128-
rt.get_state::<State>().unwrap()
128+
rt.get_state::<State>()
129129
}
130130

131131
pub fn new_runtime(&self) -> MockRuntime {

‎actors/multisig/tests/multisig_actor_test.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ fn test_add_signer() {
200200
ExitCode::OK => {
201201
let ret = h.add_signer(&mut rt, tc.add_signer, tc.increase).unwrap();
202202
assert_eq!(RawBytes::default(), ret);
203-
let st = rt.get_state::<State>().unwrap();
203+
let st: State = rt.get_state();
204204
assert_eq!(tc.expect_signers, st.signers);
205205
assert_eq!(tc.expect_approvals, st.num_approvals_threshold);
206206
}
@@ -234,7 +234,7 @@ fn test_happy_path_remove_signer() {
234234
let expected_signers = vec![anne, bob];
235235
let expected_approvals = initial_approvals;
236236

237-
let st = rt.get_state::<State>().unwrap();
237+
let st: State = rt.get_state();
238238
assert_eq!(expected_signers, st.signers);
239239
assert_eq!(expected_approvals, st.num_approvals_threshold);
240240
}
@@ -260,7 +260,7 @@ fn test_happy_path_signer_swap() {
260260
assert_eq!(RawBytes::default(), ret);
261261

262262
let expected_signers = vec![anne, chuck];
263-
let st = rt.get_state::<State>().unwrap();
263+
let st: State = rt.get_state();
264264
assert_eq!(expected_signers, st.signers);
265265
}
266266

@@ -383,6 +383,6 @@ fn test_change_threshold_happy_path_decrease_threshold() {
383383
rt.set_caller(*MULTISIG_ACTOR_CODE_ID, msig);
384384
let ret = h.change_num_approvals_threshold(&mut rt, 1).unwrap();
385385
assert_eq!(RawBytes::default(), ret);
386-
let st = rt.get_state::<State>().unwrap();
386+
let st: State = rt.get_state();
387387
assert_eq!(1, st.num_approvals_threshold);
388388
}

‎actors/multisig/tests/util.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ impl ActorHarness {
187187
rt: &MockRuntime,
188188
mut expect_txns: Vec<(TxnID, Transaction)>,
189189
) {
190-
let st = rt.get_state::<State>().unwrap();
190+
let st: State = rt.get_state();
191191
let ptx = make_map_with_root::<_, Transaction>(&st.pending_txs, &rt.store).unwrap();
192192
let mut actual_txns = Vec::new();
193193
ptx.for_each(|k, txn: &Transaction| {

‎actors/paych/tests/paych_actor_test.rs‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ mod create_lane_tests {
350350
&RawBytes::serialize(ucp).unwrap(),
351351
);
352352

353-
let st: PState = rt.get_state().unwrap();
353+
let st: PState = rt.get_state();
354354
let l_states = Amt::<LaneState, _>::load(&st.lane_states, &rt.store).unwrap();
355355
assert_eq!(l_states.count(), 1);
356356

@@ -377,7 +377,7 @@ mod update_channel_state_redeem {
377377
#[test]
378378
fn redeem_voucher_one_lane() {
379379
let (mut rt, mut sv) = require_create_channel_with_lanes(1);
380-
let state: PState = rt.get_state().unwrap();
380+
let state: PState = rt.get_state();
381381
let payee_addr = Address::new_id(PAYEE_ID);
382382

383383
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, payee_addr);
@@ -416,7 +416,7 @@ mod update_channel_state_redeem {
416416
#[test]
417417
fn redeem_voucher_correct_lane() {
418418
let (mut rt, mut sv) = require_create_channel_with_lanes(3);
419-
let state: PState = rt.get_state().unwrap();
419+
let state: PState = rt.get_state();
420420
let payee_addr = Address::new_id(PAYEE_ID);
421421

422422
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, payee_addr);
@@ -445,7 +445,7 @@ mod update_channel_state_redeem {
445445

446446
rt.verify();
447447

448-
let state: PState = rt.get_state().unwrap();
448+
let state: PState = rt.get_state();
449449
let ls_updated: LaneState = get_lane_state(&rt, &state.lane_states, sv.lane);
450450
let big_delta = &sv.amount - &ls_to_update.redeemed;
451451

@@ -458,7 +458,7 @@ mod update_channel_state_redeem {
458458
#[test]
459459
fn redeem_voucher_nonce_reuse() {
460460
let (mut rt, mut sv) = require_create_channel_with_lanes(3);
461-
let state: PState = rt.get_state().unwrap();
461+
let state: PState = rt.get_state();
462462
let payee_addr = Address::new_id(PAYEE_ID);
463463

464464
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, payee_addr);
@@ -492,7 +492,7 @@ mod merge_tests {
492492

493493
fn construct_runtime(num_lanes: u64) -> (MockRuntime, SignedVoucher, PState) {
494494
let (mut rt, sv) = require_create_channel_with_lanes(num_lanes);
495-
let state: PState = rt.get_state().unwrap();
495+
let state: PState = rt.get_state();
496496
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, state.from);
497497
rt.expect_validate_caller_addr(vec![state.from, state.to]);
498498
(rt, sv, state)
@@ -614,7 +614,7 @@ mod merge_tests {
614614
fn invalid_merge_lane_999() {
615615
let num_lanes = 2;
616616
let (mut rt, mut sv) = require_create_channel_with_lanes(num_lanes);
617-
let state: PState = rt.get_state().unwrap();
617+
let state: PState = rt.get_state();
618618

619619
sv.lane = 0;
620620
sv.nonce = 10;
@@ -642,7 +642,7 @@ mod update_channel_state_extra {
642642

643643
fn construct_runtime(exit_code: ExitCode) -> (MockRuntime, SignedVoucher) {
644644
let (mut rt, mut sv) = require_create_channel_with_lanes(1);
645-
let state: PState = rt.get_state().unwrap();
645+
let state: PState = rt.get_state();
646646
let other_addr = Address::new_id(OTHER_ADDR);
647647
let fake_params = [1, 2, 3, 4];
648648
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, state.from);
@@ -704,13 +704,13 @@ mod update_channel_state_extra {
704704
fn update_channel_settling() {
705705
let (mut rt, sv) = require_create_channel_with_lanes(1);
706706
rt.epoch = 10;
707-
let state: PState = rt.get_state().unwrap();
707+
let state: PState = rt.get_state();
708708
rt.expect_validate_caller_addr(vec![state.from, state.to]);
709709
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, state.from);
710710
call(&mut rt, Method::Settle as u64, &RawBytes::default());
711711

712712
let exp_settling_at = SETTLE_DELAY + 10;
713-
let state: PState = rt.get_state().unwrap();
713+
let state: PState = rt.get_state();
714714
assert_eq!(exp_settling_at, state.settling_at);
715715
assert_eq!(state.min_settle_height, 0);
716716

@@ -745,7 +745,7 @@ fn update_channel_settling() {
745745
result: Ok(()),
746746
});
747747
call(&mut rt, Method::UpdateChannelState as u64, &RawBytes::serialize(&ucp).unwrap());
748-
let new_state: PState = rt.get_state().unwrap();
748+
let new_state: PState = rt.get_state();
749749
assert_eq!(tc.exp_settling_at, new_state.settling_at);
750750
assert_eq!(tc.exp_min_settle_height, new_state.min_settle_height);
751751
ucp.sv.nonce += 1;
@@ -758,7 +758,7 @@ mod secret_preimage {
758758
#[test]
759759
fn succeed_correct_secret() {
760760
let (mut rt, sv) = require_create_channel_with_lanes(1);
761-
let state: PState = rt.get_state().unwrap();
761+
let state: PState = rt.get_state();
762762
rt.expect_validate_caller_addr(vec![state.from, state.to]);
763763

764764
let ucp = UpdateChannelStateParams::from(sv.clone());
@@ -779,7 +779,7 @@ mod secret_preimage {
779779
fn incorrect_secret() {
780780
let (mut rt, sv) = require_create_channel_with_lanes(1);
781781

782-
let state: PState = rt.get_state().unwrap();
782+
let state: PState = rt.get_state();
783783

784784
let mut ucp = UpdateChannelStateParams { secret: b"Profesr".to_vec(), sv: sv.clone() };
785785
let mut mag = b"Magneto".to_vec();
@@ -812,14 +812,14 @@ mod actor_settle {
812812
fn adjust_settling_at() {
813813
let (mut rt, _sv) = require_create_channel_with_lanes(1);
814814
rt.epoch = EP;
815-
let mut state: PState = rt.get_state().unwrap();
815+
let mut state: PState = rt.get_state();
816816
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, state.from);
817817
rt.expect_validate_caller_addr(vec![state.from, state.to]);
818818

819819
call(&mut rt, Method::Settle as u64, &RawBytes::default());
820820

821821
let exp_settling_at = EP + SETTLE_DELAY;
822-
state = rt.get_state().unwrap();
822+
state = rt.get_state();
823823
assert_eq!(state.settling_at, exp_settling_at);
824824
assert_eq!(state.min_settle_height, 0);
825825
}
@@ -828,7 +828,7 @@ mod actor_settle {
828828
fn call_twice() {
829829
let (mut rt, _sv) = require_create_channel_with_lanes(1);
830830
rt.epoch = EP;
831-
let state: PState = rt.get_state().unwrap();
831+
let state: PState = rt.get_state();
832832
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, state.from);
833833
rt.expect_validate_caller_addr(vec![state.from, state.to]);
834834
call(&mut rt, Method::Settle as u64, &RawBytes::default());
@@ -846,7 +846,7 @@ mod actor_settle {
846846
fn settle_if_height_less() {
847847
let (mut rt, mut sv) = require_create_channel_with_lanes(1);
848848
rt.epoch = EP;
849-
let mut state: PState = rt.get_state().unwrap();
849+
let mut state: PState = rt.get_state();
850850

851851
sv.min_settle_height = (EP + SETTLE_DELAY) + 1;
852852
let ucp = UpdateChannelStateParams::from(sv.clone());
@@ -860,7 +860,7 @@ mod actor_settle {
860860
});
861861
call(&mut rt, Method::UpdateChannelState as u64, &RawBytes::serialize(&ucp).unwrap());
862862

863-
state = rt.get_state().unwrap();
863+
state = rt.get_state();
864864
assert_eq!(state.settling_at, 0);
865865
assert_eq!(state.min_settle_height, ucp.sv.min_settle_height);
866866

@@ -869,7 +869,7 @@ mod actor_settle {
869869
rt.expect_validate_caller_addr(vec![state.from, state.to]);
870870
call(&mut rt, Method::Settle as u64, &RawBytes::default());
871871

872-
state = rt.get_state().unwrap();
872+
state = rt.get_state();
873873
assert_eq!(state.settling_at, ucp.sv.min_settle_height);
874874
}
875875

@@ -879,13 +879,13 @@ mod actor_settle {
879879

880880
let (mut rt, sv) = require_create_channel_with_lanes(1);
881881
rt.epoch = EP;
882-
let mut state: PState = rt.get_state().unwrap();
882+
let mut state: PState = rt.get_state();
883883
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, state.from);
884884
rt.expect_validate_caller_addr(vec![state.from, state.to]);
885885

886886
call(&mut rt, Method::Settle as u64, &RawBytes::default());
887887

888-
state = rt.get_state().unwrap();
888+
state = rt.get_state();
889889
rt.epoch = state.settling_at + 40;
890890
rt.expect_validate_caller_addr(vec![state.from, state.to]);
891891
rt.expect_verify_signature(ExpectedVerifySig {
@@ -913,14 +913,14 @@ mod actor_collect {
913913
let (mut rt, _sv) = require_create_channel_with_lanes(1);
914914
let curr_epoch: ChainEpoch = 10;
915915
rt.epoch = curr_epoch;
916-
let st: PState = rt.get_state().unwrap();
916+
let st: PState = rt.get_state();
917917

918918
// Settle.
919919
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, st.from);
920920
rt.expect_validate_caller_addr(vec![st.from, st.to]);
921921
call(&mut rt, Method::Settle as u64, &Default::default());
922922

923-
let st: PState = rt.get_state().unwrap();
923+
let st: PState = rt.get_state();
924924
assert_eq!(st.settling_at, SETTLE_DELAY + curr_epoch);
925925
rt.expect_validate_caller_addr(vec![st.from, st.to]);
926926

@@ -970,13 +970,13 @@ mod actor_collect {
970970
for tc in test_cases {
971971
let (mut rt, _sv) = require_create_channel_with_lanes(1);
972972
rt.epoch = 10;
973-
let mut state: PState = rt.get_state().unwrap();
973+
let mut state: PState = rt.get_state();
974974

975975
if !tc.dont_settle {
976976
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, state.from);
977977
rt.expect_validate_caller_addr(vec![state.from, state.to]);
978978
call(&mut rt, Method::Settle as u64, &RawBytes::default());
979-
state = rt.get_state().unwrap();
979+
state = rt.get_state();
980980
assert_eq!(state.settling_at, SETTLE_DELAY + rt.epoch);
981981
}
982982

@@ -1089,14 +1089,14 @@ fn construct_and_verify(rt: &mut MockRuntime, sender: Address, receiver: Address
10891089
}
10901090

10911091
fn verify_initial_state(rt: &mut MockRuntime, sender: Address, receiver: Address) {
1092-
let _state: PState = rt.get_state().unwrap();
1092+
let _state: PState = rt.get_state();
10931093
let empt_arr_cid = Amt::<(), _>::new(&rt.store).flush().unwrap();
10941094
let expected_state = PState::new(sender, receiver, empt_arr_cid);
10951095
verify_state(rt, None, expected_state)
10961096
}
10971097

10981098
fn verify_state(rt: &mut MockRuntime, exp_lanes: Option<u64>, expected_state: PState) {
1099-
let state: PState = rt.get_state().unwrap();
1099+
let state: PState = rt.get_state();
11001100
assert_eq!(expected_state.to, state.to);
11011101
assert_eq!(expected_state.from, state.from);
11021102
assert_eq!(expected_state.min_settle_height, state.min_settle_height);

0 commit comments

Comments
 (0)