merge feature-consensus with current tree and feature-network-impleme…

…nation
CityOfZion · Apr 7, 2018 · 4613730 · 4613730
1 parent 9bedea4
commit 4613730
Show file tree

Hide file tree

Showing 37 changed files with 92 additions and 97 deletions.
diff --git a/neo/Core/Block.py b/neo/Core/Block.py
@@ -157,7 +157,7 @@ def Deserialize(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         super(Block, self).Deserialize(reader)
 
@@ -241,7 +241,7 @@ def Serialize(self, writer):
         Serialize full object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         super(Block, self).Serialize(writer)
         writer.WriteSerializableArray(self.Transactions)

diff --git a/neo/Core/BlockBase.py b/neo/Core/BlockBase.py
@@ -115,7 +115,7 @@ def Deserialize(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         self.DeserializeUnsigned(reader)
         byt = reader.ReadByte()
@@ -131,7 +131,7 @@ def DeserializeUnsigned(self, reader):
         Deserialize unsigned data only.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         self.Version = reader.ReadUInt32()
         self.PrevHash = reader.ReadUInt256()
@@ -146,7 +146,7 @@ def SerializeUnsigned(self, writer):
         Serialize unsigned data only.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         writer.WriteUInt32(self.Version)
         writer.WriteUInt256(self.PrevHash)
@@ -195,7 +195,7 @@ def Serialize(self, writer):
         Serialize full object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         self.SerializeUnsigned(writer)
         writer.WriteByte(1)

diff --git a/neo/Core/CoinReference.py b/neo/Core/CoinReference.py
@@ -33,7 +33,7 @@ def Deserialize(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         self.PrevHash = reader.ReadUInt256()
         self.PrevIndex = reader.ReadUInt16()
@@ -43,7 +43,7 @@ def Serialize(self, writer):
         Serialize full object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         writer.WriteUInt256(self.PrevHash)
         writer.WriteUInt16(self.PrevIndex)

diff --git a/neo/Core/FunctionCode.py b/neo/Core/FunctionCode.py
@@ -63,7 +63,7 @@ def Deserialize(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         self.Script = reader.ReadVarBytes()
         self.ParameterList = reader.ReadVarBytes()
@@ -74,7 +74,7 @@ def Serialize(self, writer):
         Serialize full object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         writer.WriteVarBytes(self.Script)
         writer.WriteVarBytes(self.ParameterList)

diff --git a/neo/Core/Header.py b/neo/Core/Header.py
@@ -29,7 +29,7 @@ def Deserialize(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         super(Header, self).Deserialize(reader)
         if reader.ReadByte() != 0:
@@ -93,7 +93,7 @@ def Serialize(self, writer):
         Serialize full object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         super(Header, self).Serialize(writer)
         writer.WriteByte(0)
diff --git a/neo/Core/Helper.py b/neo/Core/Helper.py
@@ -13,6 +13,7 @@
 from logzero import logger
 import binascii
 
+
 class Helper(object):
 
     @staticmethod
@@ -145,11 +146,11 @@ def VerifyScripts(verifiable):
         Returns:
             bool: True if verification is successful. False otherwise.
         """
-#        try:
-        hashes = verifiable.GetScriptHashesForVerifying()
-#        except Exception as e:
-#            logger.error("couldn't get script hashes %s " % e)
-#            return False
+        try:
+            hashes = verifiable.GetScriptHashesForVerifying()
+        except Exception as e:
+            logger.error("couldn't get script hashes %s " % e)
+            return False
 
         if len(hashes) != len(verifiable.Scripts):
             return False

diff --git a/neo/Core/State/AccountState.py b/neo/Core/State/AccountState.py
@@ -133,7 +133,7 @@ def Serialize(self, writer):
         Serialize full object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         super(AccountState, self).Serialize(writer)
         writer.WriteUInt160(self.ScriptHash)

diff --git a/neo/Core/State/AssetState.py b/neo/Core/State/AssetState.py
@@ -128,7 +128,7 @@ def Serialize(self, writer):
         Serialize full object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         super(AssetState, self).Serialize(writer)
         writer.WriteUInt256(self.AssetId)

diff --git a/neo/Core/State/ContractState.py b/neo/Core/State/ContractState.py
@@ -131,7 +131,7 @@ def Serialize(self, writer):
         Serialize full object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         super(ContractState, self).Serialize(writer)
 

diff --git a/neo/Core/State/SpentCoinState.py b/neo/Core/State/SpentCoinState.py
@@ -174,7 +174,7 @@ def Serialize(self, writer):
         Serialize full object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         super(SpentCoinState, self).Serialize(writer)
 

diff --git a/neo/Core/State/StorageKey.py b/neo/Core/State/StorageKey.py
@@ -61,7 +61,7 @@ def Serialize(self, writer):
         Serialize full object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         writer.WriteUInt160(self.ScriptHash)
         writer.WriteVarBytes(self.Key)

diff --git a/neo/Core/State/UnspentCoinState.py b/neo/Core/State/UnspentCoinState.py
@@ -106,7 +106,7 @@ def Serialize(self, writer):
         Serialize full object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         super(UnspentCoinState, self).Serialize(writer)
 

diff --git a/neo/Core/State/ValidatorState.py b/neo/Core/State/ValidatorState.py
@@ -66,7 +66,7 @@ def Serialize(self, writer):
         Serialize full object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         super(ValidatorState, self).Serialize(writer)
         self.PublicKey.Serialize(writer)

diff --git a/neo/Core/TX/ClaimTransaction.py b/neo/Core/TX/ClaimTransaction.py
@@ -42,7 +42,7 @@ def DeserializeExclusiveData(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
 
         Raises:
             Exception: If the transaction type is incorrect or if there are no claims.
@@ -99,7 +99,7 @@ def SerializeExclusiveData(self, writer):
         Serialize object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         writer.WriteSerializableArray(self.Claims)
 

diff --git a/neo/Core/TX/EnrollmentTransaction.py b/neo/Core/TX/EnrollmentTransaction.py
@@ -43,7 +43,7 @@ def DeserializeExclusiveData(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
 
         Raises:
             Exception: If the version read is incorrect.
@@ -58,7 +58,7 @@ def SerializeExclusiveData(self, writer):
         Serialize object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         self.PublicKey.Serialize(writer, True)
 

diff --git a/neo/Core/TX/InvocationTransaction.py b/neo/Core/TX/InvocationTransaction.py
@@ -42,7 +42,7 @@ def DeserializeExclusiveData(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
 
         Raises:
             Exception: If the version read is incorrect.
@@ -67,7 +67,7 @@ def SerializeExclusiveData(self, writer):
         Serialize object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         writer.WriteVarBytes(self.Script)
         if self.Version >= 1:

diff --git a/neo/Core/TX/IssueTransaction.py b/neo/Core/TX/IssueTransaction.py
@@ -55,7 +55,7 @@ def DeserializeExclusiveData(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
 
         self.Type = TransactionType.IssueTransaction

diff --git a/neo/Core/TX/MinerTransaction.py b/neo/Core/TX/MinerTransaction.py
@@ -42,7 +42,7 @@ def DeserializeExclusiveData(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         self.Nonce = reader.ReadUInt32()
         self.Type = TransactionType.MinerTransaction
@@ -61,7 +61,7 @@ def SerializeExclusiveData(self, writer):
         Serialize object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         self.SerializeExclusiveDataAlternative(writer)
 

diff --git a/neo/Core/TX/PublishTransaction.py b/neo/Core/TX/PublishTransaction.py
@@ -39,7 +39,7 @@ def DeserializeExclusiveData(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         if self.Version > 1:
             logger.error("format exception...")
@@ -63,7 +63,7 @@ def SerializeExclusiveData(self, writer):
         Serialize object.
 
         Args:
-            writer (neo.IO.BinaryWriter):
+            writer (neocore.IO.BinaryWriter):
         """
         self.Code.Serialize(writer)