pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-18 04:51:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename ExecutionContext::parent to caller (#5285)

Browse Source
This commit is contained in:
Stanislav Tkach
2020-03-21 23:17:06 +02:00
committed by GitHub
parent 56264ad1fc
commit 41a8d43161
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/contracts/src/exec.rs
+6 -6
View File
@@ -289,7 +289,7 @@ pub enum DeferredAction<T: Trait> {
} }
pub struct ExecutionContext<'a, T: Trait + 'a, V, L> { pub struct ExecutionContext<'a, T: Trait + 'a, V, L> {
pub parent: Option<&'a ExecutionContext<'a, T, V, L>>, pub caller: Option<&'a ExecutionContext<'a, T, V, L>>,
pub self_account: T::AccountId, pub self_account: T::AccountId,
pub self_trie_id: Option<TrieId>, pub self_trie_id: Option<TrieId>,
pub overlay: OverlayAccountDb<'a, T>, pub overlay: OverlayAccountDb<'a, T>,
@@ -314,7 +314,7 @@ where
/// account (not a contract). /// account (not a contract).
pub fn top_level(origin: T::AccountId, cfg: &'a Config<T>, vm: &'a V, loader: &'a L) -> Self { pub fn top_level(origin: T::AccountId, cfg: &'a Config<T>, vm: &'a V, loader: &'a L) -> Self {
ExecutionContext { ExecutionContext {
parent: None, caller: None,
self_trie_id: None, self_trie_id: None,
self_account: origin, self_account: origin,
overlay: OverlayAccountDb::<T>::new(&DirectAccountDb), overlay: OverlayAccountDb::<T>::new(&DirectAccountDb),
@@ -332,7 +332,7 @@ where
-> ExecutionContext<'b, T, V, L> -> ExecutionContext<'b, T, V, L>
{ {
ExecutionContext { ExecutionContext {
parent: Some(self), caller: Some(self),
self_trie_id: trie_id, self_trie_id: trie_id,
self_account: dest, self_account: dest,
overlay: OverlayAccountDb::new(&self.overlay), overlay: OverlayAccountDb::new(&self.overlay),
@@ -535,8 +535,8 @@ where
) -> Result<(), DispatchError> { ) -> Result<(), DispatchError> {
let self_id = self.self_account.clone(); let self_id = self.self_account.clone();
let value = self.overlay.get_balance(&self_id); let value = self.overlay.get_balance(&self_id);
if let Some(parent) = self.parent { if let Some(caller) = self.caller {
if parent.is_live(&self_id) { if caller.is_live(&self_id) {
return Err(DispatchError::Other( return Err(DispatchError::Other(
"Cannot terminate a contract that is present on the call stack", "Cannot terminate a contract that is present on the call stack",
)); ));
@@ -592,7 +592,7 @@ where
/// stack, meaning it is in the middle of an execution. /// stack, meaning it is in the middle of an execution.
fn is_live(&self, account: &T::AccountId) -> bool { fn is_live(&self, account: &T::AccountId) -> bool {
&self.self_account == account || &self.self_account == account ||
self.parent.map_or(false, |parent| parent.is_live(account)) self.caller.map_or(false, |caller| caller.is_live(account))
} }
} }