Merge branch 'development' of github.com:localhuman/neo-python into d…

…evelopment
CityOfZion · Oct 21, 2017 · 7a2dd77 · 7a2dd77
2 parents dd0931f + 2023e6d
commit 7a2dd77
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/neo/SmartContract/StateMachine.py b/neo/SmartContract/StateMachine.py
@@ -81,7 +81,7 @@ def CheckStorageContext(self, context):
         contract = self._contracts.TryGet(context.ScriptHash.ToBytes())
 
         if contract is not None:
-            if contract is not None and contract.HasStorage:
+            if contract.HasStorage:
                 return True
 
         return False

diff --git a/neo/SmartContract/StateReader.py b/neo/SmartContract/StateReader.py
@@ -705,15 +705,19 @@ def Storage_Get(self, engine):
             return False
 
 
-        if not self.CheckStorageContext(context):
+        contract = Blockchain.Default().GetContract(context.ScriptHash.ToBytes())
+
+        if contract is not None:
+            if not contract.HasStorage:
+                return False
+        else:
             return False
 
+
         key = engine.EvaluationStack.Pop().GetByteArray()
         storage_key = StorageKey(script_hash=context.ScriptHash, key = key)
 
-        # @TODO Replace _storages in state reader
         item = Blockchain.Default().GetStorageItem(storage_key.GetHashCodeBytes())
-#        item = self._storages.TryGet(storage_key.GetHashCodeBytes())
 
         keystr = key