Skip to content

Commit bd05e7f

Browse files
DreyhhDreyhh
committed
Added call to set_fruniques_do_spawn for afloatfinish_take_sell_transaction benchmark, replaced unwraps with assert_ok for calls to helpers functions that dont return a value in afloat benchmarks
1 parent 7f9cf81 commit bd05e7f

File tree

1 file changed

+49
-47
lines changed

1 file changed

+49
-47
lines changed

‎pallets/afloat/src/benchmarking.rs

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -348,9 +348,9 @@ mod benchmarks {
348348
fn initial_setup() {
349349
let admin: T::AccountId = account("admin", 0, SEED);
350350
let creator: T::AccountId = account("creator", 0, SEED);
351-
set_max_balance::<T>(admin.clone()).unwrap();
352-
set_max_balance::<T>(creator.clone()).unwrap();
353-
set_rbac_assign_role_to_user_worst_case::<T>(admin.clone(), 0, true).unwrap();
351+
assert_ok!(set_max_balance::<T>(admin.clone()));
352+
assert_ok!(set_max_balance::<T>(creator.clone()));
353+
assert_ok!(set_rbac_assign_role_to_user_worst_case::<T>(admin.clone(), 0, true));
354354
let asset_id: T::AssetId = T::AfloatBenchHelper::asset(0);
355355
let min_balance: T::Balance = T::AfloatBenchHelper::balance(1);
356356
let asset: CreateAsset<T> = CreateAsset::New { asset_id, min_balance };
@@ -367,7 +367,7 @@ mod benchmarks {
367367

368368
#[benchmark]
369369
fn kill_storage() {
370-
init::<T>().unwrap();
370+
assert_ok!(init::<T>());
371371
assert!(Afloat::<T>::marketplace_id().is_some());
372372
assert!(Afloat::<T>::collection_id().is_some());
373373
assert!(Afloat::<T>::asset_id().is_some());
@@ -387,8 +387,8 @@ mod benchmarks {
387387
let sign_up_args = SignUpArgs::BuyerOrSeller { cid: cid.clone(), cid_creator, group };
388388
let user: T::AccountId = account("user", 0, SEED);
389389

390-
init::<T>().unwrap();
391-
set_rbac_assign_role_to_user_worst_case::<T>(user.clone(), 1, false).unwrap();
390+
assert_ok!(init::<T>());
391+
assert_ok!(set_rbac_assign_role_to_user_worst_case::<T>(user.clone(), 1, false));
392392

393393
#[extrinsic_call]
394394
_(RawOrigin::Signed(user.clone()), sign_up_args);
@@ -398,7 +398,7 @@ mod benchmarks {
398398

399399
#[benchmark]
400400
fn update_user_info() {
401-
init::<T>().unwrap();
401+
assert_ok!(init::<T>());
402402

403403
let user: T::AccountId = account("user", 0, SEED);
404404
register_user::<T>(user.clone(), "user").unwrap();
@@ -412,7 +412,7 @@ mod benchmarks {
412412

413413
let update_user_info_args = UpdateUserArgs::Delete;
414414

415-
set_rbac_assign_role_to_user_worst_case::<T>(user.clone(), 1, false).unwrap();
415+
assert_ok!(set_rbac_assign_role_to_user_worst_case::<T>(user.clone(), 1, false));
416416

417417
let admin: T::AccountId = account("admin", 0, SEED);
418418
#[extrinsic_call]
@@ -424,8 +424,8 @@ mod benchmarks {
424424
#[benchmark]
425425
fn create_tax_credit(a: Linear<0, { <T as pallet_fruniques::Config>::MaxAttributes::get() }>) {
426426
let user: T::AccountId = account("user", 0, SEED);
427-
init::<T>().unwrap();
428-
register_user::<T>(user.clone(), "user").unwrap();
427+
assert_ok!(init::<T>());
428+
assert_ok!(register_user::<T>(user.clone(), "user"));
429429

430430
let attributes: Attributes<T> = create_sized_attributes::<T>(
431431
a,
@@ -436,7 +436,7 @@ mod benchmarks {
436436
create_sized_description::<T>(<T as pallet_uniques::Config>::StringLimit::get());
437437
let parent_info = create_sized_parent_info::<T>(0, 0, MAX_U32, true);
438438
assert_eq!(attributes.len() as u32, a);
439-
set_up_fruniques_do_spawn_worst_case::<T>(user.clone()).unwrap();
439+
assert_ok!(set_up_fruniques_do_spawn_worst_case::<T>(user.clone()));
440440

441441
#[extrinsic_call]
442442
_(RawOrigin::Signed(user.clone()), description, Some(attributes), Some(parent_info));
@@ -445,9 +445,9 @@ mod benchmarks {
445445
#[benchmark]
446446
fn create_offer() {
447447
let user: T::AccountId = account("user", 0, SEED);
448-
init::<T>().unwrap();
449-
register_user::<T>(user.clone(), "user").unwrap();
450-
add_tax_credit::<T>(user.clone()).unwrap();
448+
assert_ok!(init::<T>());
449+
assert_ok!(register_user::<T>(user.clone(), "user"));
450+
assert_ok!(add_tax_credit::<T>(user.clone()));
451451
let args = CreateOfferArgs::Sell {
452452
tax_credit_amount: MAX_TAX_CREDIT_AMOUNT,
453453
tax_credit_id: T::AfloatBenchHelper::item(0),
@@ -463,12 +463,12 @@ mod benchmarks {
463463
fn start_take_sell_order() {
464464
let user: T::AccountId = account("user", 0, SEED);
465465
let other_user: T::AccountId = account("other_user", 0, SEED);
466-
set_max_balance::<T>(other_user.clone()).unwrap();
467-
set_max_balance::<T>(user.clone()).unwrap();
468-
init::<T>().unwrap();
469-
register_user::<T>(user.clone(), "user").unwrap();
470-
register_user::<T>(other_user.clone(), "other_user").unwrap();
471-
add_tax_credit::<T>(user.clone()).unwrap();
466+
assert_ok!(set_max_balance::<T>(other_user.clone()));
467+
assert_ok!(set_max_balance::<T>(user.clone()));
468+
assert_ok!(init::<T>());
469+
assert_ok!(register_user::<T>(user.clone(), "user"));
470+
assert_ok!(register_user::<T>(other_user.clone(), "other_user"));
471+
assert_ok!(add_tax_credit::<T>(user.clone()));
472472
let offer_id = add_sell_order::<T>(user.clone()).unwrap();
473473
let offer = AfloatOffers::<T>::get(offer_id).unwrap();
474474
let offer_trxs = offer.transactions.clone();
@@ -481,7 +481,7 @@ mod benchmarks {
481481
T::Balance::max_value().into(),
482482
);
483483

484-
set_start_take_sell_offer_worst_case::<T>(other_user.clone(), offer_id.clone()).unwrap();
484+
assert_ok!(set_start_take_sell_offer_worst_case::<T>(other_user.clone(), offer_id.clone()));
485485

486486
#[extrinsic_call]
487487
_(RawOrigin::Signed(other_user), offer_id, MAX_U32.into());
@@ -496,19 +496,19 @@ mod benchmarks {
496496
fn confirm_sell_transaction() {
497497
let user: T::AccountId = account("user", 0, SEED);
498498
let other_user: T::AccountId = account("other_user", 0, SEED);
499-
set_max_balance::<T>(other_user.clone()).unwrap();
500-
set_max_balance::<T>(user.clone()).unwrap();
501-
init::<T>().unwrap();
502-
register_user::<T>(user.clone(), "user").unwrap();
503-
register_user::<T>(other_user.clone(), "other_user").unwrap();
504-
add_tax_credit::<T>(user.clone()).unwrap();
499+
assert_ok!(set_max_balance::<T>(other_user.clone()));
500+
assert_ok!(set_max_balance::<T>(user.clone()));
501+
assert_ok!(init::<T>());
502+
assert_ok!(register_user::<T>(user.clone(), "user"));
503+
assert_ok!(register_user::<T>(other_user.clone(), "other_user"));
504+
assert_ok!(add_tax_credit::<T>(user.clone()));
505505
let offer_id = add_sell_order::<T>(user.clone()).unwrap();
506506

507507
let transaction_id = add_start_take_sell_order::<T>(other_user.clone(), offer_id).unwrap();
508508
let transaction = AfloatTransactions::<T>::get(transaction_id).unwrap();
509509
assert_eq!(transaction.confirmed, false);
510510

511-
set_gm_do_enlist_sell_offer_worst_case::<T>(other_user.clone(), offer_id).unwrap();
511+
assert_ok!(set_gm_do_enlist_sell_offer_worst_case::<T>(other_user.clone(), offer_id));
512512

513513
#[extrinsic_call]
514514
_(RawOrigin::Signed(user.clone()), transaction_id);
@@ -521,15 +521,17 @@ mod benchmarks {
521521
fn finish_take_sell_transaction() {
522522
let user: T::AccountId = account("user", 0, SEED);
523523
let other_user: T::AccountId = account("other_user", 0, SEED);
524-
set_max_balance::<T>(other_user.clone()).unwrap();
525-
set_max_balance::<T>(user.clone()).unwrap();
526-
init::<T>().unwrap();
527-
register_user::<T>(user.clone(), "user").unwrap();
528-
register_user::<T>(other_user.clone(), "other_user").unwrap();
529-
add_tax_credit::<T>(user.clone()).unwrap();
524+
assert_ok!(set_max_balance::<T>(other_user.clone()));
525+
assert_ok!(set_max_balance::<T>(user.clone()));
526+
assert_ok!(init::<T>());
527+
assert_ok!(register_user::<T>(user.clone(), "user"));
528+
assert_ok!(register_user::<T>(other_user.clone(), "other_user"));
529+
assert_ok!(add_tax_credit::<T>(user.clone()));
530530
let offer_id = add_sell_order::<T>(user.clone()).unwrap();
531531
let transaction_id = add_start_take_sell_order::<T>(other_user.clone(), offer_id).unwrap();
532-
add_confirm_sell_transaction::<T>(user.clone(), transaction_id).unwrap();
532+
// used internally by gm do_take_sell_offer when tax credit amount < 100
533+
assert_ok!(set_up_fruniques_do_spawn_worst_case::<T>(other_user.clone()));
534+
assert_ok!(add_confirm_sell_transaction::<T>(user.clone(), transaction_id));
533535
let transaction = AfloatTransactions::<T>::get(transaction_id).unwrap();
534536
assert_eq!(transaction.completed, false);
535537

@@ -543,9 +545,9 @@ mod benchmarks {
543545
#[benchmark]
544546
fn set_afloat_balance() {
545547
let user: T::AccountId = account("user", 0, SEED);
546-
set_max_balance::<T>(user.clone()).unwrap();
547-
init::<T>().unwrap();
548-
register_user::<T>(user.clone(), "user").unwrap();
548+
assert_ok!(set_max_balance::<T>(user.clone()));
549+
assert_ok!(init::<T>());
550+
assert_ok!(register_user::<T>(user.clone(), "user"));
549551
let admin: T::AccountId = account("admin", 0, SEED);
550552
let amount = T::AfloatBenchHelper::balance(MAX_U64);
551553
assert_eq!(
@@ -560,9 +562,9 @@ mod benchmarks {
560562
#[benchmark]
561563
fn cancel_offer() {
562564
let user: T::AccountId = account("user", 0, SEED);
563-
init::<T>().unwrap();
564-
register_user::<T>(user.clone(), "user").unwrap();
565-
add_tax_credit::<T>(user.clone()).unwrap();
565+
assert_ok!(init::<T>());
566+
assert_ok!(register_user::<T>(user.clone(), "user"));
567+
assert_ok!(add_tax_credit::<T>(user.clone()));
566568
let offer_id = add_sell_order::<T>(user.clone()).unwrap();
567569
let offer = AfloatOffers::<T>::get(offer_id).unwrap();
568570
assert_eq!(offer.status, OfferStatus::CREATED);
@@ -576,9 +578,9 @@ mod benchmarks {
576578
fn add_afloat_admin() {
577579
let user: T::AccountId = account("user", 0, SEED);
578580
let admin: T::AccountId = account("admin", 0, SEED);
579-
init::<T>().unwrap();
580-
register_user::<T>(user.clone(), "user").unwrap();
581-
set_rbac_assign_role_to_user_worst_case::<T>(user.clone(), 2, false).unwrap();
581+
assert_ok!(init::<T>());
582+
assert_ok!(register_user::<T>(user.clone(), "user"));
583+
assert_ok!(set_rbac_assign_role_to_user_worst_case::<T>(user.clone(), 2, false));
582584
assert!(!Afloat::<T>::is_admin(user.clone()).unwrap());
583585
#[extrinsic_call]
584586
_(RawOrigin::Signed(admin.clone()), user.clone());
@@ -589,9 +591,9 @@ mod benchmarks {
589591
fn assign_user_to_role() {
590592
let user: T::AccountId = account("user", 0, SEED);
591593
let admin: T::AccountId = account("admin", 0, SEED);
592-
init::<T>().unwrap();
593-
register_user::<T>(user.clone(), "user").unwrap();
594-
set_rbac_assign_role_to_user_worst_case::<T>(user.clone(), 2, false).unwrap();
594+
assert_ok!(init::<T>());
595+
assert_ok!(register_user::<T>(user.clone(), "user"));
596+
assert_ok!(set_rbac_assign_role_to_user_worst_case::<T>(user.clone(), 2, false));
595597
let role: AfloatRole = AfloatRole::CPA;
596598
assert!(!Afloat::<T>::is_cpa(user.clone()).unwrap());
597599
#[extrinsic_call]

0 commit comments

Comments
 (0)