Remove extra commas made redundent after rustfmt (#9404)

* Remove extra commas made redundent after rustfmt
This commit is contained in:
Squirrel
2021-07-22 11:06:17 +01:00
committed by GitHub
parent e18f388dac
commit aafe64315a
101 changed files with 309 additions and 309 deletions
+17 -17
View File
@@ -639,7 +639,7 @@ fn storage_size() {
let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
assert_eq!(bob_contract.storage_size, 4);
assert_eq!(bob_contract.pair_count, 1,);
assert_eq!(bob_contract.pair_count, 1);
assert_ok!(Contracts::call(
Origin::signed(ALICE),
@@ -650,7 +650,7 @@ fn storage_size() {
));
let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
assert_eq!(bob_contract.storage_size, 4 + 4);
assert_eq!(bob_contract.pair_count, 2,);
assert_eq!(bob_contract.pair_count, 2);
assert_ok!(Contracts::call(
Origin::signed(ALICE),
@@ -661,7 +661,7 @@ fn storage_size() {
));
let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
assert_eq!(bob_contract.storage_size, 4);
assert_eq!(bob_contract.pair_count, 1,);
assert_eq!(bob_contract.pair_count, 1);
});
}
@@ -682,8 +682,8 @@ fn empty_kv_pairs() {
let addr = Contracts::contract_address(&ALICE, &code_hash, &[]);
let bob_contract = ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap();
assert_eq!(bob_contract.storage_size, 0,);
assert_eq!(bob_contract.pair_count, 1,);
assert_eq!(bob_contract.storage_size, 0);
assert_eq!(bob_contract.pair_count, 1);
});
}
@@ -993,7 +993,7 @@ fn removals(trigger_call: impl Fn(AccountIdOf<Test>) -> bool) {
ContractInfoOf::<Test>::get(&addr).unwrap().get_alive().unwrap().rent_allowance,
allowance,
);
assert_eq!(Balances::free_balance(&addr), balance,);
assert_eq!(Balances::free_balance(&addr), balance);
// Make contract have exactly the subsistence threshold
Balances::make_free_balance_be(&addr, subsistence_threshold);
@@ -1357,14 +1357,14 @@ fn restoration(
assert_eq!(django_contract.storage_size, 8);
assert_eq!(django_contract.trie_id, django_trie_id);
assert_eq!(django_contract.deduct_block, System::block_number());
assert_eq!(Storage::<Test>::read(&django_trie_id, &delta_key), Some(vec![40, 0, 0, 0]),);
assert_eq!(Storage::<Test>::read(&django_trie_id, &delta_key), Some(vec![40, 0, 0, 0]));
match (test_different_storage, test_restore_to_with_dirty_storage, test_code_evicted) {
(true, false, false) => {
assert_err_ignore_postinfo!(result, Error::<Test>::InvalidTombstone,);
assert_err_ignore_postinfo!(result, Error::<Test>::InvalidTombstone);
assert_eq!(System::events(), vec![]);
},
(_, true, false) => {
assert_err_ignore_postinfo!(result, Error::<Test>::InvalidContractOrigin,);
assert_err_ignore_postinfo!(result, Error::<Test>::InvalidContractOrigin);
assert_eq!(
System::events(),
vec![
@@ -1428,7 +1428,7 @@ fn restoration(
);
},
(false, false, true) => {
assert_err_ignore_postinfo!(result, Error::<Test>::CodeNotFound,);
assert_err_ignore_postinfo!(result, Error::<Test>::CodeNotFound);
assert_refcount!(set_rent_code_hash, 0);
assert_eq!(System::events(), vec![]);
},
@@ -1576,7 +1576,7 @@ fn cannot_self_destruct_through_draning() {
// Call BOB which makes it send all funds to the zero address
// The contract code asserts that the correct error value is returned.
assert_ok!(Contracts::call(Origin::signed(ALICE), addr, 0, GAS_LIMIT, vec![],));
assert_ok!(Contracts::call(Origin::signed(ALICE), addr, 0, GAS_LIMIT, vec![]));
});
}
@@ -2155,7 +2155,7 @@ fn lazy_removal_works() {
child::put(trie, &[99], &42);
// Terminate the contract
assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],));
assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![]));
// Contract info should be gone
assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
@@ -2209,7 +2209,7 @@ fn lazy_removal_partial_remove_works() {
<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
// Terminate the contract
assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],));
assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![]));
// Contract info should be gone
assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
@@ -2286,7 +2286,7 @@ fn lazy_removal_does_no_run_on_full_block() {
<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
// Terminate the contract
assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],));
assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![]));
// Contract info should be gone
assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
@@ -2359,7 +2359,7 @@ fn lazy_removal_does_not_use_all_weight() {
<ContractInfoOf<Test>>::insert(&addr, ContractInfo::Alive(info.clone()));
// Terminate the contract
assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![],));
assert_ok!(Contracts::call(Origin::signed(ALICE), addr.clone(), 0, GAS_LIMIT, vec![]));
// Contract info should be gone
assert!(!<ContractInfoOf::<Test>>::contains_key(&addr));
@@ -2543,7 +2543,7 @@ fn refcounter() {
let addr2 = Contracts::contract_address(&ALICE, &code_hash, &[2]);
// Terminating one contract should decrement the refcount
assert_ok!(Contracts::call(Origin::signed(ALICE), addr0, 0, GAS_LIMIT, vec![],));
assert_ok!(Contracts::call(Origin::signed(ALICE), addr0, 0, GAS_LIMIT, vec![]));
assert_refcount!(code_hash, 2);
// make remaining contracts eligible for eviction
@@ -2657,7 +2657,7 @@ fn debug_message_logging_disabled() {
let result = Contracts::bare_call(ALICE, addr.clone(), 0, GAS_LIMIT, vec![], false);
assert_matches!(result.result, Ok(_));
// the dispatchables always run without debugging
assert_ok!(Contracts::call(Origin::signed(ALICE), addr, 0, GAS_LIMIT, vec![],));
assert_ok!(Contracts::call(Origin::signed(ALICE), addr, 0, GAS_LIMIT, vec![]));
assert!(result.debug_message.is_empty());
});
}