Skip to content

Commit

Permalink
feat: allow zero-sized inputs for tangle-based macros (#507)
Browse files Browse the repository at this point in the history
  • Loading branch information
tbraun96 authored Nov 29, 2024
1 parent 6b00641 commit b3f7ce3
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
14 changes: 7 additions & 7 deletions blueprint-test-utils/src/mpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ macro_rules! mpc_generate_keygen_and_signing_tests {
$N:tt,
$T:tt,
$keygen_job_id:tt,
[$($keygen_inputs:expr),+],
[$($keygen_inputs:expr),*],
[$($expected_keygen_outputs:expr),*],
$signing_job_id:tt,
[$($signing_inputs:expr),+],
[$($signing_inputs:expr),*],
[$($expected_signing_outputs:expr),*],
$atomic_keygen_call_id_store:expr,
) => {
Expand All @@ -24,13 +24,13 @@ macro_rules! mpc_generate_keygen_and_signing_tests {
"Submitting KEYGEN job {} with service ID {service_id}", $keygen_job_id
);

let job_args = vec![$($keygen_inputs),+];
let job_args = vec![$($keygen_inputs),*];

let job = submit_job(
client,
&keypair,
service_id,
Job::from($keygen_job_id as u8),
Job::from(0),
job_args,
)
.await
Expand Down Expand Up @@ -64,21 +64,21 @@ macro_rules! mpc_generate_keygen_and_signing_tests {
log::info!("Keygen job completed successfully! Moving on to signing ...");

// ~~~~~ Now, run a signing job ~~~~~
let service = &blueprint.services[$keygen_job_id as usize];
let service = &blueprint.services[0];

let service_id = service.id;
gadget_sdk::info!(
"Submitting SIGNING job {} with service ID {service_id}", $signing_job_id
);

// Pass the arguments
let job_args = vec![$($signing_inputs),+];
let job_args = vec![$($signing_inputs),*];

let job = submit_job(
client,
&keypair,
service_id,
Job::from($signing_job_id as u8),
Job::from(0),
job_args,
)
.await
Expand Down
16 changes: 8 additions & 8 deletions blueprint-test-utils/src/tangle/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,28 +90,28 @@ macro_rules! test_tangle_blueprint {
$N:tt,
$T:tt,
$job_id:tt,
[$($inputs:expr),+],
[$($expected_output:expr),+]
[$($inputs:expr),*],
[$($expected_output:expr),*]
) => {
tangle_blueprint_test_template!(
$blueprint_path,
$N,
|client, handles, blueprint| async move {
let keypair = handles[0].sr25519_id().clone();
let selected_service = &blueprint.services[$job_id];
let selected_service = &blueprint.services[0];
let service_id = selected_service.id;

gadget_sdk::info!(
"Submitting job {} with service ID {service_id}", $job_id
);

let job_args = vec![$($inputs),+];
let job_args = vec![$($inputs),*];

let job = submit_job(
client,
&keypair,
service_id,
Job::from($job_id as u8),
Job::from(0),
job_args,
)
.await
Expand All @@ -130,7 +130,7 @@ macro_rules! test_tangle_blueprint {
assert_eq!(job_results.service_id, service_id);
assert_eq!(job_results.call_id, call_id);

let expected_outputs = vec![$($expected_output),+];
let expected_outputs = vec![$($expected_output),*];
if expected_outputs.is_empty() {
gadget_sdk::info!("No expected outputs specified, skipping verification");
return
Expand All @@ -148,8 +148,8 @@ macro_rules! test_tangle_blueprint {
$blueprint_path:expr,
$N:tt,
$job_id:tt,
[$($input:expr),+],
[$($expected_output:expr),+]
[$($input:expr),*],
[$($expected_output:expr),*]
) => {
test_tangle_blueprint!($blueprint_path, $N, $N, $job_id, [$($input),+], [$($expected_output),+]);
};
Expand Down
Submodule forge-std updated 1 files
+1 −1 package.json
2 changes: 1 addition & 1 deletion blueprints/incredible-squaring/contracts/lib/forge-std
Submodule forge-std updated 1 files
+1 −1 package.json

0 comments on commit b3f7ce3

Please sign in to comment.