pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-13 23:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

actually update deduct_block when paying rent (#2490)

Browse Source 
* actually update deduct_block when paying rent

* add test

* remove println

* same block call test

* bump version
This commit is contained in:
thiolliere
2019-05-07 14:13:56 +02:00
committed by GitHub
parent 1436e6d734
commit d380db706b
3 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/srml/contract/src/rent.rs
+8 -4
View File
@@ -55,10 +55,12 @@ fn try_evict_or_and_pay_rent<T: Trait>(
Some(ContractInfo::Alive(contract)) => contract,
};
let current_block_number = <system::Module<T>>::block_number();
// How much block has passed since the last deduction for the contract.
let blocks_passed = {
// Calculate an effective block number, i.e. after adjusting for handicap.
let effective_block_number = <system::Module<T>>::block_number().saturating_sub(handicap);
let effective_block_number = current_block_number.saturating_sub(handicap);
let n = effective_block_number.saturating_sub(contract.deduct_block);
if n.is_zero() {
// Rent has already been paid
@@ -125,11 +127,13 @@ fn try_evict_or_and_pay_rent<T: Trait>(
);
<ContractInfoOf<T>>::mutate(account, |contract| {
contract
let contract = contract
.as_mut()
.and_then(|c| c.as_alive_mut())
.expect("Dead or inexistent account has been exempt above; qed")
.rent_allowance -= imbalance.peek(); // rent_allowance is not exceeded
.expect("Dead or inexistent account has been exempt above; qed");
contract.rent_allowance -= imbalance.peek(); // rent_allowance is not exceeded
contract.deduct_block = current_block_number;
})
}