Make sure a regular account is not automatically changed to its owner

Author: majecty

state/src/impls/top_level.rs

@@ -608,21 +608,6 @@ impl TopLevelState {
     /// First searches for account in the local, then the shared cache.
     /// Populates local cache if nothing found.
     fn ensure_account_cached<F, U>(&self, a: &Address, f: F) -> TrieResult<U>
-    where
-        F: Fn(Option<&Account>) -> U, {
-        let a = if self.regular_account_exists_and_not_null(a)? {
-            let regular_account = self.require_regular_account_from_address(a)?;
-            public_to_address(&regular_account.owner_public())
-        } else {
-            a.clone()
-        };
-
-        self.ensure_master_account_cached(&a, f)
-    }
-
-    /// Same with ensure_master_account.
-    /// But do not pass regular_account redirection
-    fn ensure_master_account_cached<F, U>(&self, a: &Address, f: F) -> TrieResult<U>
     where
         F: Fn(Option<&Account>) -> U, {
         let db = TrieFactory::readonly(self.db.as_hashdb(), &self.root)?;
@@ -736,10 +721,6 @@ impl TopState<StateDB> for TopLevelState {
         self.ensure_account_cached(a, |a| a.map_or(false, |a| !a.nonce().is_zero()))
     }
 
-    fn master_account_exists_and_not_null(&self, a: &Address) -> TrieResult<bool> {
-        self.ensure_master_account_cached(a, |a| a.map_or(false, |a| !a.is_null()))
-    }
-
     fn regular_account_exists_and_not_null(&self, a: &Address) -> TrieResult<bool> {
         self.ensure_regular_account_cached(a, |a| a.map_or(false, |a| !a.is_null()))
     }
@@ -800,7 +781,7 @@ impl TopState<StateDB> for TopLevelState {
             return Err(ParcelError::RegularKeyAlreadyInUse.into())
         }
 
-        if self.master_account_exists_and_not_null(&regular_address)? {
+        if self.account_exists_and_not_null(&regular_address)? {
             return Err(ParcelError::RegularKeyAlreadyInUseAsMaster.into())
         }
 

state/src/traits.rs

@@ -90,7 +90,6 @@ where
     fn account_exists_and_not_null(&self, a: &Address) -> TrieResult<bool>;
     fn account_exists_and_has_nonce(&self, a: &Address) -> TrieResult<bool>;
 
-    fn master_account_exists_and_not_null(&self, a: &Address) -> TrieResult<bool>;
     fn regular_account_exists_and_not_null(&self, a: &Address) -> TrieResult<bool>;
 
     /// Add `incr` to the balance of account `a`.