Skip to content

Commit cbc3421

Browse files
committed
rustfmt
1 parent b2aa170 commit cbc3421

File tree

3 files changed

+35
-44
lines changed

3 files changed

+35
-44
lines changed

wasm/src/programs/program.rs

+1-10
Original file line numberDiff line numberDiff line change
@@ -579,31 +579,26 @@ function add_and_double:
579579
"key_type": "address",
580580
"value_type": "committee_state",
581581
},
582-
583582
object! {
584583
"name": "metadata",
585584
"key_type": "address",
586585
"value_type": "u32",
587586
},
588-
589587
object! {
590588
"name": "bonded",
591589
"key_type": "address",
592590
"value_type": "bond_state",
593591
},
594-
595592
object! {
596593
"name": "unbonding",
597594
"key_type": "address",
598595
"value_type": "unbond_state",
599596
},
600-
601597
object! {
602598
"name": "account",
603599
"key_type": "address",
604600
"value_type": "u64",
605601
},
606-
607602
object! {
608603
"name": "withdraw",
609604
"key_type": "address",
@@ -652,13 +647,11 @@ function add_and_double:
652647
],
653648
"register": "r0",
654649
},
655-
656650
object! {
657651
"type": "address",
658652
"visibility": "private",
659653
"register": "r1",
660654
},
661-
662655
object! {
663656
"type": "u64",
664657
"visibility": "private",
@@ -677,7 +670,6 @@ function add_and_double:
677670
"visibility": "private",
678671
"register": "r0",
679672
},
680-
681673
object! {
682674
"type": "record",
683675
"record": "Token",
@@ -716,7 +708,6 @@ function add_and_double:
716708
],
717709
"register": "r1",
718710
},
719-
720711
object! {
721712
"type": "struct",
722713
"struct_id": "token_metadata",
@@ -811,7 +802,7 @@ function add_and_double:
811802
let program = Program::from_string(TOKEN_ISSUE).unwrap();
812803
let members = program.get_struct_members("token_metadata".to_string()).unwrap();
813804

814-
let expected = array! [
805+
let expected = array![
815806
object! {
816807
"name": "token_id",
817808
"type": "u32",

wasm/src/programs/proving_key/credits.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,11 @@ mod tests {
205205
let metadata: serde_json::Value =
206206
serde_json::from_str(proving_key_metadata).expect("Metadata was not well-formatted");
207207
let checksum = metadata["prover_checksum"].as_str().expect("Failed to parse checksum").to_string();
208-
format!("https://s3-us-west-1.amazonaws.com/testnet.parameters/{}.prover.{}", function_name, checksum.get(0..7).unwrap())
208+
format!(
209+
"https://s3-us-west-1.amazonaws.com/testnet.parameters/{}.prover.{}",
210+
function_name,
211+
checksum.get(0..7).unwrap()
212+
)
209213
}
210214

211215
/*#[wasm_bindgen_test]

wasm/src/programs/verifying_key/mod.rs

+29-33
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,8 @@ mod tests {
209209

210210
#[wasm_bindgen_test]
211211
async fn test_verifying_key_parsing() {
212-
use std::sync::Arc;
213212
use snarkvm_console::prelude::IoResult;
214-
use std::io::Read;
213+
use std::{io::Read, sync::Arc};
215214

216215
fn read_le<R: Read>(mut reader: R) -> IoResult<bool> {
217216
let version = u8::read_le(&mut reader)?;
@@ -222,48 +221,45 @@ mod tests {
222221
Ok(reader.bytes().into_iter().collect::<Vec<_>>().len() > 0)
223222
}
224223

225-
fn parse<F>(name: &'static str, f: F) -> Option<&'static str> where F: FnOnce() -> Vec<u8> {
226-
if read_le(f().as_slice()).unwrap() {
227-
None
228-
229-
} else {
230-
Some(name)
231-
}
224+
fn parse<F>(name: &'static str, f: F) -> Option<&'static str>
225+
where
226+
F: FnOnce() -> Vec<u8>,
227+
{
228+
if read_le(f().as_slice()).unwrap() { None } else { Some(name) }
232229
}
233230

234-
let results = vec! [
235-
parse("TransferPublicVerifier", || snarkvm_parameters::testnet::TransferPublicVerifier::load_bytes().unwrap()),
231+
let results = vec![
232+
parse("TransferPublicVerifier", || {
233+
snarkvm_parameters::testnet::TransferPublicVerifier::load_bytes().unwrap()
234+
}),
236235
parse("BondPublicVerifier", || snarkvm_parameters::testnet::BondPublicVerifier::load_bytes().unwrap()),
237-
parse("ClaimUnbondPublicVerifier", || snarkvm_parameters::testnet::ClaimUnbondPublicVerifier::load_bytes().unwrap()),
236+
parse("ClaimUnbondPublicVerifier", || {
237+
snarkvm_parameters::testnet::ClaimUnbondPublicVerifier::load_bytes().unwrap()
238+
}),
238239
parse("FeePrivateVerifier", || snarkvm_parameters::testnet::FeePrivateVerifier::load_bytes().unwrap()),
239240
parse("FeePublicVerifier", || snarkvm_parameters::testnet::FeePublicVerifier::load_bytes().unwrap()),
240241
parse("InclusionVerifier", || snarkvm_parameters::testnet::InclusionVerifier::load_bytes().unwrap()),
241242
parse("JoinVerifier", || snarkvm_parameters::testnet::JoinVerifier::load_bytes().unwrap()),
242-
parse("SetValidatorStateVerifier", || snarkvm_parameters::testnet::SetValidatorStateVerifier::load_bytes().unwrap()),
243+
parse("SetValidatorStateVerifier", || {
244+
snarkvm_parameters::testnet::SetValidatorStateVerifier::load_bytes().unwrap()
245+
}),
243246
parse("SplitVerifier", || snarkvm_parameters::testnet::SplitVerifier::load_bytes().unwrap()),
244-
parse("TransferPrivateVerifier", || snarkvm_parameters::testnet::TransferPrivateVerifier::load_bytes().unwrap()),
245-
parse("TransferPrivateToPublicVerifier", || snarkvm_parameters::testnet::TransferPrivateToPublicVerifier::load_bytes().unwrap()),
246-
parse("TransferPublicToPrivateVerifier", || snarkvm_parameters::testnet::TransferPublicToPrivateVerifier::load_bytes().unwrap()),
247-
parse("UnbondDelegatorAsValidatorVerifier", || snarkvm_parameters::testnet::UnbondDelegatorAsValidatorVerifier::load_bytes().unwrap()),
247+
parse("TransferPrivateVerifier", || {
248+
snarkvm_parameters::testnet::TransferPrivateVerifier::load_bytes().unwrap()
249+
}),
250+
parse("TransferPrivateToPublicVerifier", || {
251+
snarkvm_parameters::testnet::TransferPrivateToPublicVerifier::load_bytes().unwrap()
252+
}),
253+
parse("TransferPublicToPrivateVerifier", || {
254+
snarkvm_parameters::testnet::TransferPublicToPrivateVerifier::load_bytes().unwrap()
255+
}),
256+
parse("UnbondDelegatorAsValidatorVerifier", || {
257+
snarkvm_parameters::testnet::UnbondDelegatorAsValidatorVerifier::load_bytes().unwrap()
258+
}),
248259
parse("UnbondPublicVerifier", || snarkvm_parameters::testnet::UnbondPublicVerifier::load_bytes().unwrap()),
249260
];
250261

251-
assert_eq!(results, vec![
252-
None,
253-
None,
254-
None,
255-
None,
256-
None,
257-
None,
258-
None,
259-
None,
260-
None,
261-
None,
262-
None,
263-
None,
264-
None,
265-
None,
266-
]);
262+
assert_eq!(results, vec![None, None, None, None, None, None, None, None, None, None, None, None, None, None,]);
267263
}
268264

269265
#[wasm_bindgen_test]

0 commit comments

Comments
 (0)