pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-18 17:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Default rent allowance to max_value (#2461)

Browse Source 
* Default rent allowance to max_value

* Bump spec version

* Fix exec test

* Address grumbles

* Make test comment less specific

* Default rent_allowance to max_value in exec

* Check default balance on creation

* Check default balance in deploy

* Use hex constant

Co-Authored-By: ascjones <ascjones@gmail.com>

* More specific code const

Co-Authored-By: ascjones <ascjones@gmail.com>

* Update srml/contract/src/tests.rs

Co-Authored-By: ascjones <ascjones@gmail.com>

* Update srml/contract/src/tests.rs

Co-Authored-By: ascjones <ascjones@gmail.com>

* Update srml/contract/src/tests.rs

Co-Authored-By: ascjones <ascjones@gmail.com>
This commit is contained in:
Andrew Jones
2019-05-04 12:59:14 +01:00
committed by Gavin Wood
parent 35b84ae8f6
commit 9fdd7df582
4 changed files with 95 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/srml/contract/src/account_db.rs
+3 -3
View File
@@ -25,7 +25,7 @@ use rstd::cell::RefCell;
use rstd::collections::btree_map::{BTreeMap, Entry};
use rstd::prelude::*;
use runtime_io::blake2_256;
use runtime_primitives::traits::Zero;
use runtime_primitives::traits::{Bounded, Zero};
use srml_support::traits::{Currency, Imbalance, SignedImbalance, UpdateBalanceOutcome};
use srml_support::{storage::child, StorageMap};
use system;
@@ -123,7 +123,7 @@ impl<T: Trait> AccountDb<T> for DirectAccountDb {
storage_size: <Module<T>>::storage_size_offset(),
trie_id: <T as Trait>::TrieIdGenerator::trie_id(&address),
deduct_block: <system::Module<T>>::block_number(),
rent_allowance: <BalanceOf<T>>::zero(),
rent_allowance: <BalanceOf<T>>::max_value(),
}
} else {
// No contract exist and no code_hash provided
@@ -213,7 +213,7 @@ impl<'a, T: Trait> OverlayAccountDb<'a, T> {
let contract = local.entry(account.clone()).or_insert_with(|| Default::default());
contract.code_hash = Some(code_hash);
contract.rent_allowance = Some(<BalanceOf<T>>::zero());
contract.rent_allowance = Some(<BalanceOf<T>>::max_value());
Ok(())
}