@@ -209,9 +209,8 @@ mod tests {
209
209
210
210
#[ wasm_bindgen_test]
211
211
async fn test_verifying_key_parsing ( ) {
212
- use std:: sync:: Arc ;
213
212
use snarkvm_console:: prelude:: IoResult ;
214
- use std:: io:: Read ;
213
+ use std:: { io:: Read , sync :: Arc } ;
215
214
216
215
fn read_le < R : Read > ( mut reader : R ) -> IoResult < bool > {
217
216
let version = u8:: read_le ( & mut reader) ?;
@@ -222,48 +221,45 @@ mod tests {
222
221
Ok ( reader. bytes ( ) . into_iter ( ) . collect :: < Vec < _ > > ( ) . len ( ) > 0 )
223
222
}
224
223
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) }
232
229
}
233
230
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
+ } ) ,
236
235
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
+ } ) ,
238
239
parse( "FeePrivateVerifier" , || snarkvm_parameters:: testnet:: FeePrivateVerifier :: load_bytes( ) . unwrap( ) ) ,
239
240
parse( "FeePublicVerifier" , || snarkvm_parameters:: testnet:: FeePublicVerifier :: load_bytes( ) . unwrap( ) ) ,
240
241
parse( "InclusionVerifier" , || snarkvm_parameters:: testnet:: InclusionVerifier :: load_bytes( ) . unwrap( ) ) ,
241
242
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
+ } ) ,
243
246
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
+ } ) ,
248
259
parse( "UnbondPublicVerifier" , || snarkvm_parameters:: testnet:: UnbondPublicVerifier :: load_bytes( ) . unwrap( ) ) ,
249
260
] ;
250
261
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 , ] ) ;
267
263
}
268
264
269
265
#[ wasm_bindgen_test]
0 commit comments