Skip to content

Commit 7d62272

Browse files
anorthanorth
committed
last bits
1 parent caac588 commit 7d62272

File tree

8 files changed

+30
-30
lines changed

8 files changed

+30
-30
lines changed

‎actors/init/tests/init_actor_test.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fn abort_cant_call_exec() {
3636

3737
let err =
3838
exec_and_verify(&mut rt, *POWER_ACTOR_CODE_ID, &"").expect_err("Exec should have failed");
39-
assert_eq!(err.exit_code(), ExitCode::ErrForbidden);
39+
assert_eq!(err.exit_code(), ExitCode::USR_FORBIDDEN);
4040
}
4141

4242
#[test]

‎actors/market/tests/market_actor_test.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ fn account_actor_check() {
225225
rt.set_caller(*MINER_ACTOR_CODE_ID, provider_addr);
226226

227227
assert_eq!(
228-
ExitCode::ErrForbidden,
228+
ExitCode::USR_FORBIDDEN,
229229
rt.call::<MarketActor>(
230230
Method::AddBalance as u64,
231231
&RawBytes::serialize(provider_addr).unwrap(),

‎actors/miner/tests/miner_actor_test_wpost.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ fn invalid_submissions() {
205205
params,
206206
PoStConfig::empty(),
207207
);
208-
expect_abort_contains_message(ExitCode::ErrNotFound, "no such partition", result);
208+
expect_abort_contains_message(ExitCode::USR_NOT_FOUND, "no such partition", result);
209209
rt.reset();
210210
}
211211

‎actors/multisig/tests/multisig_actor_test.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ fn test_add_signer() {
160160
increase: false,
161161
expect_signers: vec![anne, bob, chuck],
162162
expect_approvals: 3,
163-
code: ExitCode::ErrForbidden,
163+
code: ExitCode::USR_FORBIDDEN,
164164
},
165165
TestCase{
166166
desc: "fail to add signer with ID address that already exists even thugh we only have non ID address as approver",
@@ -171,7 +171,7 @@ fn test_add_signer() {
171171
increase:false,
172172
expect_signers: vec![anne, bob, chuck],
173173
expect_approvals: 3,
174-
code: ExitCode::ErrForbidden,
174+
code: ExitCode::USR_FORBIDDEN,
175175
},
176176
TestCase{
177177
desc: "fail to add signer with ID address that already exists even thugh we only have non ID address as approver",
@@ -182,7 +182,7 @@ fn test_add_signer() {
182182
increase:false,
183183
expect_signers: vec![anne, bob, chuck],
184184
expect_approvals: 3,
185-
code: ExitCode::ErrForbidden,
185+
code: ExitCode::USR_FORBIDDEN,
186186
}
187187
];
188188

‎actors/paych/tests/paych_actor_test.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ mod paych_constructor {
128128
caller_code: *INIT_ACTOR_CODE_ID,
129129
new_actor_code: *MULTISIG_ACTOR_CODE_ID,
130130
payer_code: *ACCOUNT_ACTOR_CODE_ID,
131-
expected_exit_code: ExitCode::ErrForbidden,
131+
expected_exit_code: ExitCode::USR_FORBIDDEN,
132132
}];
133133

134134
for test_case in test_cases {
@@ -637,12 +637,12 @@ mod update_channel_state_extra {
637637
#[test]
638638
#[ignore = "old functionality -- test framework needs to be updated"]
639639
fn extra_call_fail() {
640-
let (mut rt, sv) = construct_runtime(ExitCode::ErrPlaceholder);
640+
let (mut rt, sv) = construct_runtime(ExitCode::USR_UNSPECIFIED);
641641
expect_error(
642642
&mut rt,
643643
Method::UpdateChannelState as u64,
644644
&RawBytes::serialize(UpdateChannelStateParams::from(sv)).unwrap(),
645-
ExitCode::ErrPlaceholder,
645+
ExitCode::USR_UNSPECIFIED,
646646
);
647647
rt.verify();
648648
}
@@ -876,13 +876,13 @@ mod actor_collect {
876876
TestCase {
877877
dont_settle: true,
878878
exp_send_to: ExitCode::OK,
879-
exp_collect_exit: ExitCode::ErrForbidden,
879+
exp_collect_exit: ExitCode::USR_FORBIDDEN,
880880
},
881881
// fails if Failed to send funds to `To`
882882
TestCase {
883883
dont_settle: false,
884-
exp_send_to: ExitCode::ErrPlaceholder,
885-
exp_collect_exit: ExitCode::ErrPlaceholder,
884+
exp_send_to: ExitCode::USR_UNSPECIFIED,
885+
exp_collect_exit: ExitCode::USR_UNSPECIFIED,
886886
},
887887
];
888888

‎actors/reward/tests/reward_actor_test.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ mod test_award_block_reward {
254254
RawBytes::serialize(BigIntSer(&expected_reward)).unwrap(),
255255
expected_reward.clone(),
256256
RawBytes::default(),
257-
ExitCode::ErrForbidden,
257+
ExitCode::USR_FORBIDDEN,
258258
);
259259
rt.expect_send(
260260
*BURNT_FUNDS_ACTOR_ADDR,

‎actors/runtime/src/test_utils.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ impl Runtime<MemoryBlockstore> for MockRuntime {
637637
}
638638
}
639639
expectations.expect_validate_caller_addr = None;
640-
return Err(actor_error!(SysErrForbidden;
640+
return Err(actor_error!(forbidden;
641641
"caller address {:?} forbidden, allowed: {:?}",
642642
self.message().caller(), &addrs
643643
));
@@ -677,7 +677,7 @@ impl Runtime<MemoryBlockstore> for MockRuntime {
677677

678678
self.expectations.borrow_mut().expect_validate_caller_type = None;
679679

680-
Err(actor_error!(SysErrForbidden; "caller type {:?} forbidden, allowed: {:?}",
680+
Err(actor_error!(forbidden; "caller type {:?} forbidden, allowed: {:?}",
681681
self.caller_type, types))
682682
}
683683

@@ -769,7 +769,7 @@ impl Runtime<MemoryBlockstore> for MockRuntime {
769769

770770
fn create<C: Cbor>(&mut self, obj: &C) -> Result<(), ActorError> {
771771
if self.state.is_some() {
772-
return Err(actor_error!(SysErrIllegalActor; "state already constructed"));
772+
return Err(actor_error!(illegal_state; "state already constructed"));
773773
}
774774
self.state = Some(self.store.put_cbor(obj, Code::Blake2b256).unwrap());
775775
Ok(())
@@ -785,7 +785,7 @@ impl Runtime<MemoryBlockstore> for MockRuntime {
785785
F: FnOnce(&mut C, &mut Self) -> Result<RT, ActorError>,
786786
{
787787
if self.in_transaction {
788-
return Err(actor_error!(SysErrIllegalActor; "nested transaction"));
788+
return Err(actor_error!(unspecified; "nested transaction"));
789789
}
790790
let mut read_only = self.state()?;
791791
self.in_transaction = true;
@@ -810,7 +810,7 @@ impl Runtime<MemoryBlockstore> for MockRuntime {
810810
) -> Result<RawBytes, ActorError> {
811811
self.require_in_call();
812812
if self.in_transaction {
813-
return Err(actor_error!(SysErrIllegalActor; "side-effect within transaction"));
813+
return Err(actor_error!(unspecified; "side-effect within transaction"));
814814
}
815815

816816
assert!(
@@ -831,9 +831,9 @@ impl Runtime<MemoryBlockstore> for MockRuntime {
831831
{
832832
let mut balance = self.balance.borrow_mut();
833833
if value > *balance {
834-
return Err(actor_error!(SysErrSenderStateInvalid;
835-
"cannot send value: {:?} exceeds balance: {:?}",
836-
value, *balance
834+
return Err(ActorError::unchecked(
835+
ExitCode::SYS_SENDER_STATE_INVALID,
836+
format!("cannot send value: {:?} exceeds balance: {:?}", value, *balance),
837837
));
838838
}
839839
*balance -= value;
@@ -855,7 +855,7 @@ impl Runtime<MemoryBlockstore> for MockRuntime {
855855
fn create_actor(&mut self, code_id: Cid, actor_id: ActorID) -> Result<(), ActorError> {
856856
self.require_in_call();
857857
if self.in_transaction {
858-
return Err(actor_error!(SysErrIllegalActor; "side-effect within transaction"));
858+
return Err(actor_error!(unspecified; "side-effect within transaction"));
859859
}
860860
let expect_create_actor = self
861861
.expectations
@@ -871,7 +871,7 @@ impl Runtime<MemoryBlockstore> for MockRuntime {
871871
fn delete_actor(&mut self, addr: &Address) -> Result<(), ActorError> {
872872
self.require_in_call();
873873
if self.in_transaction {
874-
return Err(actor_error!(SysErrIllegalActor; "side-effect within transaction"));
874+
return Err(actor_error!(unspecified; "side-effect within transaction"));
875875
}
876876
let exp_act = self.expectations.borrow_mut().expect_delete_actor.take();
877877
if exp_act.is_none() {

‎actors/verifreg/tests/verifreg_actor_test.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ mod verifiers {
8888
allowance: VERIFIER_ALLOWANCE.clone(),
8989
};
9090
expect_abort(
91-
ExitCode::SysErrForbidden,
91+
ExitCode::USR_FORBIDDEN,
9292
rt.call::<VerifregActor>(
9393
Method::AddVerifier as MethodNum,
9494
&RawBytes::serialize(params).unwrap(),
@@ -183,7 +183,7 @@ mod verifiers {
183183
rt.set_caller(*ACCOUNT_ACTOR_CODE_ID, caller);
184184
assert_ne!(h.root, caller);
185185
expect_abort(
186-
ExitCode::SysErrForbidden,
186+
ExitCode::USR_FORBIDDEN,
187187
rt.call::<VerifregActor>(
188188
Method::RemoveVerifier as MethodNum,
189189
&RawBytes::serialize(*VERIFIER).unwrap(),
@@ -355,7 +355,7 @@ mod clients {
355355
let params =
356356
AddVerifierClientParams { address: *CLIENT, allowance: CLIENT_ALLOWANCE.clone() };
357357
expect_abort(
358-
ExitCode::ErrNotFound,
358+
ExitCode::USR_NOT_FOUND,
359359
rt.call::<VerifregActor>(
360360
Method::AddVerifiedClient as MethodNum,
361361
&RawBytes::serialize(params).unwrap(),
@@ -495,7 +495,7 @@ mod datacap {
495495
// Use full allowance.
496496
h.use_bytes(&mut rt, &CLIENT, &allowance).unwrap();
497497
// Fail to use any more because client was removed.
498-
expect_abort(ExitCode::ErrNotFound, h.use_bytes(&mut rt, &CLIENT, &allowance));
498+
expect_abort(ExitCode::USR_NOT_FOUND, h.use_bytes(&mut rt, &CLIENT, &allowance));
499499
h.check_state()
500500
}
501501

@@ -507,7 +507,7 @@ mod datacap {
507507
let params =
508508
UseBytesParams { address: *CLIENT, deal_size: MINIMUM_VERIFIED_DEAL_SIZE.clone() };
509509
expect_abort(
510-
ExitCode::SysErrForbidden,
510+
ExitCode::USR_FORBIDDEN,
511511
rt.call::<VerifregActor>(
512512
Method::UseBytes as MethodNum,
513513
&RawBytes::serialize(params).unwrap(),
@@ -536,7 +536,7 @@ mod datacap {
536536
fn consume_requires_client_exists() {
537537
let (h, mut rt) = new_harness();
538538
expect_abort(
539-
ExitCode::ErrNotFound,
539+
ExitCode::USR_NOT_FOUND,
540540
h.use_bytes(&mut rt, &CLIENT, &MINIMUM_VERIFIED_DEAL_SIZE),
541541
);
542542
h.check_state()
@@ -661,7 +661,7 @@ mod datacap {
661661
let params =
662662
RestoreBytesParams { address: *CLIENT, deal_size: MINIMUM_VERIFIED_DEAL_SIZE.clone() };
663663
expect_abort(
664-
ExitCode::SysErrForbidden,
664+
ExitCode::USR_FORBIDDEN,
665665
rt.call::<VerifregActor>(
666666
Method::RestoreBytes as MethodNum,
667667
&RawBytes::serialize(params).unwrap(),

0 commit comments

Comments
 (0)