Skip to content

Commit

Permalink
FVM::serialize_cbor now returns Option<IpldBlcok>
Browse files Browse the repository at this point in the history
  • Loading branch information
@arajasek
arajasek committed Dec 12, 2022
1 parent 189a1aa commit 30ac751
Show file tree
Hide file tree
Showing 43 changed files with 535 additions and 688 deletions.
30 changes: 15 additions & 15 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 14 additions & 18 deletions actors/account/tests/account_actor_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fn construction() {
if exit_code.is_success() {
rt.call::<AccountActor>(
Method::Constructor as MethodNum,
Some(IpldBlock::serialize_cbor(&addr).unwrap()),
IpldBlock::serialize_cbor(&addr).unwrap(),
)
.unwrap();

Expand All @@ -47,7 +47,7 @@ fn construction() {
} else {
expect_abort(
exit_code,
rt.call::<AccountActor>(1, Some(IpldBlock::serialize_cbor(&addr).unwrap())),
rt.call::<AccountActor>(1, IpldBlock::serialize_cbor(&addr).unwrap()),
)
}
rt.verify();
Expand Down Expand Up @@ -75,20 +75,18 @@ fn token_receiver() {
let param = Address::new_secp256k1(&[2; fvm_shared::address::SECP_PUB_LEN]).unwrap();
rt.call::<AccountActor>(
Method::Constructor as MethodNum,
Some(IpldBlock::serialize_cbor(&param).unwrap()),
IpldBlock::serialize_cbor(&param).unwrap(),
)
.unwrap();

rt.expect_validate_caller_any();
let ret = rt.call::<AccountActor>(
Method::UniversalReceiverHook as MethodNum,
Some(
IpldBlock::serialize_cbor(&UniversalReceiverParams {
type_: 0,
payload: RawBytes::new(vec![1, 2, 3]),
})
.unwrap(),
),
IpldBlock::serialize_cbor(&UniversalReceiverParams {
type_: 0,
payload: RawBytes::new(vec![1, 2, 3]),
})
.unwrap(),
);
assert!(ret.is_ok());
assert_eq!(RawBytes::default(), ret.unwrap());
Expand All @@ -112,18 +110,16 @@ fn authenticate_message() {
let addr = Address::new_secp256k1(&[2; fvm_shared::address::SECP_PUB_LEN]).unwrap();
rt.expect_validate_caller_addr(vec![SYSTEM_ACTOR_ADDR]);

rt.call::<AccountActor>(1, Some(IpldBlock::serialize_cbor(&addr).unwrap())).unwrap();
rt.call::<AccountActor>(1, IpldBlock::serialize_cbor(&addr).unwrap()).unwrap();

let state: State = rt.get_state();
assert_eq!(state.address, addr);

let params = Some(
IpldBlock::serialize_cbor(&AuthenticateMessageParams {
signature: vec![],
message: vec![],
})
.unwrap(),
);
let params = IpldBlock::serialize_cbor(&AuthenticateMessageParams {
signature: vec![],
message: vec![],
})
.unwrap();

rt.expect_validate_caller_any();
rt.expect_verify_signature(ExpectedVerifySig {
Expand Down
2 changes: 1 addition & 1 deletion actors/cron/tests/cron_actor_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ fn epoch_tick_with_entries() {

fn construct_and_verify(rt: &mut MockRuntime, params: &ConstructorParams) {
rt.expect_validate_caller_addr(vec![SYSTEM_ACTOR_ADDR]);
let ret = rt.call::<CronActor>(1, Some(IpldBlock::serialize_cbor(&params).unwrap())).unwrap();
let ret = rt.call::<CronActor>(1, IpldBlock::serialize_cbor(&params).unwrap()).unwrap();
assert_eq!(RawBytes::default(), ret);
rt.verify();
}
Expand Down
4 changes: 2 additions & 2 deletions actors/datacap/tests/datacap_actor_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ mod mint {
"caller address",
rt.call::<Actor>(
Method::Mint as MethodNum,
Some(IpldBlock::serialize_cbor(&params).unwrap()),
IpldBlock::serialize_cbor(&params).unwrap(),
),
);
h.check_state(&rt);
Expand Down Expand Up @@ -218,7 +218,7 @@ mod destroy {
"caller address",
rt.call::<Actor>(
Method::Destroy as MethodNum,
Some(IpldBlock::serialize_cbor(&params).unwrap()),
IpldBlock::serialize_cbor(&params).unwrap(),
),
);

Expand Down
16 changes: 8 additions & 8 deletions actors/datacap/tests/harness/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl Harness {
let ret = rt
.call::<DataCapActor>(
Method::Constructor as MethodNum,
Some(IpldBlock::serialize_cbor(registry).unwrap()),
IpldBlock::serialize_cbor(registry).unwrap(),
)
.unwrap();

Expand Down Expand Up @@ -86,7 +86,7 @@ impl Harness {
rt.expect_send(
*to,
frc42_dispatch::method_hash!("Receive"),
Some(IpldBlock::serialize_cbor(&hook_params).unwrap()),
IpldBlock::serialize_cbor(&hook_params).unwrap(),
TokenAmount::zero(),
RawBytes::default(),
ExitCode::OK,
Expand All @@ -96,7 +96,7 @@ impl Harness {
rt.set_caller(*VERIFREG_ACTOR_CODE_ID, VERIFIED_REGISTRY_ACTOR_ADDR);
let ret = rt.call::<DataCapActor>(
Method::Mint as MethodNum,
Some(IpldBlock::serialize_cbor(&params).unwrap()),
IpldBlock::serialize_cbor(&params).unwrap(),
)?;

rt.verify();
Expand All @@ -116,7 +116,7 @@ impl Harness {
rt.set_caller(*VERIFREG_ACTOR_CODE_ID, VERIFIED_REGISTRY_ACTOR_ADDR);
let ret = rt.call::<DataCapActor>(
Method::Destroy as MethodNum,
Some(IpldBlock::serialize_cbor(&params).unwrap()),
IpldBlock::serialize_cbor(&params).unwrap(),
)?;

rt.verify();
Expand Down Expand Up @@ -153,7 +153,7 @@ impl Harness {
rt.expect_send(
*to,
frc42_dispatch::method_hash!("Receive"),
Some(IpldBlock::serialize_cbor(&hook_params).unwrap()),
IpldBlock::serialize_cbor(&hook_params).unwrap(),
TokenAmount::zero(),
RawBytes::default(),
ExitCode::OK,
Expand All @@ -162,7 +162,7 @@ impl Harness {
let params = TransferParams { to: *to, amount: amount.clone(), operator_data };
let ret = rt.call::<DataCapActor>(
Method::Transfer as MethodNum,
Some(IpldBlock::serialize_cbor(&params).unwrap()),
IpldBlock::serialize_cbor(&params).unwrap(),
)?;

rt.verify();
Expand Down Expand Up @@ -200,7 +200,7 @@ impl Harness {
rt.expect_send(
*to,
frc42_dispatch::method_hash!("Receive"),
Some(IpldBlock::serialize_cbor(&hook_params).unwrap()),
IpldBlock::serialize_cbor(&hook_params).unwrap(),
TokenAmount::zero(),
RawBytes::default(),
ExitCode::OK,
Expand All @@ -210,7 +210,7 @@ impl Harness {
TransferFromParams { to: *to, from: *from, amount: amount.clone(), operator_data };
let ret = rt.call::<DataCapActor>(
Method::TransferFrom as MethodNum,
Some(IpldBlock::serialize_cbor(&params).unwrap()),
IpldBlock::serialize_cbor(&params).unwrap(),
)?;

rt.verify();
Expand Down
20 changes: 9 additions & 11 deletions actors/init/tests/init_actor_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fn repeated_robust_address() {
rt.expect_send(
expected_id_addr,
METHOD_CONSTRUCTOR,
Some(IpldBlock::serialize_cbor(&fake_params).unwrap()),
IpldBlock::serialize_cbor(&fake_params).unwrap(),
TokenAmount::zero(),
RawBytes::default(),
ExitCode::OK,
Expand All @@ -99,7 +99,7 @@ fn repeated_robust_address() {

let ret = rt.call::<InitActor>(
Method::Exec as u64,
Some(IpldBlock::serialize_cbor(&exec_params).unwrap()),
IpldBlock::serialize_cbor(&exec_params).unwrap(),
);

rt.verify();
Expand Down Expand Up @@ -138,7 +138,7 @@ fn create_2_payment_channels() {
rt.expect_send(
expected_id_addr,
METHOD_CONSTRUCTOR,
Some(IpldBlock::serialize_cbor(&fake_params).unwrap()),
IpldBlock::serialize_cbor(&fake_params).unwrap(),
balance,
RawBytes::default(),
ExitCode::OK,
Expand Down Expand Up @@ -180,7 +180,7 @@ fn create_storage_miner() {
rt.expect_send(
expected_id_addr,
METHOD_CONSTRUCTOR,
Some(IpldBlock::serialize_cbor(&fake_params).unwrap()),
IpldBlock::serialize_cbor(&fake_params).unwrap(),
TokenAmount::zero(),
RawBytes::default(),
ExitCode::OK,
Expand Down Expand Up @@ -231,7 +231,7 @@ fn create_multisig_actor() {
rt.expect_send(
expected_id_addr,
METHOD_CONSTRUCTOR,
Some(IpldBlock::serialize_cbor(&fake_params).unwrap()),
IpldBlock::serialize_cbor(&fake_params).unwrap(),
TokenAmount::zero(),
RawBytes::default(),
ExitCode::OK,
Expand Down Expand Up @@ -266,7 +266,7 @@ fn sending_constructor_failure() {
rt.expect_send(
expected_id_addr,
METHOD_CONSTRUCTOR,
Some(IpldBlock::serialize_cbor(&fake_params).unwrap()),
IpldBlock::serialize_cbor(&fake_params).unwrap(),
TokenAmount::zero(),
RawBytes::default(),
ExitCode::USR_ILLEGAL_STATE,
Expand Down Expand Up @@ -294,7 +294,7 @@ fn construct_and_verify(rt: &mut MockRuntime) {
rt.expect_validate_caller_addr(vec![SYSTEM_ACTOR_ADDR]);
let params = ConstructorParams { network_name: "mock".to_string() };
let ret = rt
.call::<InitActor>(METHOD_CONSTRUCTOR, Some(IpldBlock::serialize_cbor(&params).unwrap()))
.call::<InitActor>(METHOD_CONSTRUCTOR, IpldBlock::serialize_cbor(&params).unwrap())
.unwrap();

assert_eq!(RawBytes::default(), ret);
Expand Down Expand Up @@ -324,10 +324,8 @@ where
let exec_params =
ExecParams { code_cid: code_id, constructor_params: RawBytes::serialize(params).unwrap() };

let ret = rt.call::<InitActor>(
Method::Exec as u64,
Some(IpldBlock::serialize_cbor(&exec_params).unwrap()),
);
let ret =
rt.call::<InitActor>(Method::Exec as u64, IpldBlock::serialize_cbor(&exec_params).unwrap());

rt.verify();
check_state(rt);
Expand Down
6 changes: 3 additions & 3 deletions actors/market/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ impl Actor {
.send(
&DATACAP_TOKEN_ACTOR_ADDR,
ext::datacap::TRANSFER_FROM_METHOD as u64,
Some(IpldBlock::serialize_cbor(&params)?),
IpldBlock::serialize_cbor(&params)?,
TokenAmount::zero(),
)
.and_then(|ret| datacap_transfer_response(&ret));
Expand Down Expand Up @@ -1053,10 +1053,10 @@ fn deal_proposal_is_internally_valid(
rt.send(
&proposal.proposal.client,
ext::account::AUTHENTICATE_MESSAGE_METHOD,
Some(IpldBlock::serialize_cbor(&ext::account::AuthenticateMessageParams {
IpldBlock::serialize_cbor(&ext::account::AuthenticateMessageParams {
signature: signature_bytes,
message: proposal_bytes,
})?),
})?,
TokenAmount::zero(),
)
.map_err(|e| e.wrap("proposal authentication failed"))?;
Expand Down
Loading

0 comments on commit 30ac751

Please sign in to comment.