Move base datatypes to neocore

neo/Core/Block.py

@@ -4,13 +4,13 @@
 from neo.Network.InventoryType import InventoryType
 from neo.Core.BlockBase import BlockBase
 from neo.Core.TX.Transaction import Transaction, TransactionType
+from neocore.IO.BinaryReader import BinaryReader
+from neocore.IO.BinaryWriter import BinaryWriter
 from neo.IO.MemoryStream import StreamManager
-from neo.IO.BinaryReader import BinaryReader
-from neo.IO.BinaryWriter import BinaryWriter
 from neo.Cryptography.MerkleTree import MerkleTree
 from neo.Core.Header import Header
 from neo.Core.Witness import Witness
-from neo.Fixed8 import Fixed8
+from neocore.Fixed8 import Fixed8
 from neo.Blockchain import GetBlockchain
 
 

neo/Core/BlockBase.py

@@ -4,7 +4,7 @@
 from neo.Core.Helper import Helper
 from neo.Blockchain import GetBlockchain, GetGenesis
 from neo.Core.Witness import Witness
-from neo.UInt256 import UInt256
+from neocore.UInt256 import UInt256
 
 
 class BlockBase(VerifiableMixin):

neo/Core/Blockchain.py

@@ -14,9 +14,9 @@
 from neo.Cryptography.Crypto import *
 from neo.Cryptography.Helper import *
 from collections import Counter
-from neo.Fixed8 import Fixed8
+from neocore.Fixed8 import Fixed8
 from neo.Cryptography.ECCurve import ECDSA
-from neo.UInt256 import UInt256
+from neocore.UInt256 import UInt256
 
 
 class Blockchain(object):

neo/Core/FunctionCode.py

@@ -1,4 +1,4 @@
-from neo.IO.Mixins import SerializableMixin
+from neocore.IO.Mixins import SerializableMixin
 from neo.Cryptography.Crypto import Crypto
 
 

neo/Core/Header.py

@@ -1,8 +1,8 @@
 # -*- coding: UTF-8 -*-
 
 from neo.Core.BlockBase import BlockBase
+from neocore.IO.BinaryReader import BinaryReader
 from neo.IO.MemoryStream import StreamManager
-from neo.IO.BinaryReader import BinaryReader
 from neo.Core.Witness import Witness
 
 

neo/Core/Helper.py

@@ -1,12 +1,12 @@
 from base58 import b58decode
 from neo.Blockchain import GetBlockchain, GetStateReader
 from neo.Cryptography.Crypto import *
-from neo.IO.BinaryWriter import BinaryWriter
+from neocore.IO.BinaryWriter import BinaryWriter
+from neocore.UInt160 import UInt160
 from neo.IO.MemoryStream import StreamManager
-from neo.UInt160 import UInt160
 from neo.VM.ScriptBuilder import ScriptBuilder
 from neo.SmartContract.ApplicationEngine import ApplicationEngine
-from neo.Fixed8 import Fixed8
+from neocore.Fixed8 import Fixed8
 from neo.SmartContract import TriggerType
 from neo.Settings import settings
 

neo/Core/Mixins.py

@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 
-from neo.IO.Mixins import SerializableMixin
+from neocore.IO.Mixins import SerializableMixin
 
 
 class ClonableMixin(object):

neo/Core/State/AccountState.py

@@ -1,10 +1,10 @@
 import sys
 from .StateBase import StateBase
-from neo.Fixed8 import Fixed8
-from neo.IO.BinaryReader import BinaryReader
+from neocore.Fixed8 import Fixed8
+from neocore.IO.BinaryReader import BinaryReader
 from neo.IO.MemoryStream import StreamManager
 from neo.Cryptography.Crypto import Crypto
-from neo.IO.BinaryWriter import BinaryWriter
+from neocore.IO.BinaryWriter import BinaryWriter
 
 
 class AccountState(StateBase):
@@ -111,7 +111,7 @@ def Deserialize(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         super(AccountState, self).Deserialize(reader)
         self.ScriptHash = reader.ReadUInt160()

neo/Core/State/AssetState.py

@@ -1,9 +1,9 @@
 from .StateBase import StateBase
-from neo.Fixed8 import Fixed8
-from neo.IO.BinaryReader import BinaryReader
+from neocore.Fixed8 import Fixed8
+from neocore.IO.BinaryReader import BinaryReader
 from neo.IO.MemoryStream import StreamManager
 from neo.Core.AssetType import AssetType
-from neo.UInt160 import UInt160
+from neocore.UInt160 import UInt160
 from neo.Cryptography.Crypto import Crypto
 from neo.Cryptography.ECCurve import EllipticCurve, ECDSA
 
@@ -94,7 +94,7 @@ def Deserialize(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         super(AssetState, self).Deserialize(reader)
         self.AssetId = reader.ReadUInt256()

neo/Core/State/ContractState.py

@@ -1,5 +1,5 @@
 from .StateBase import StateBase
-from neo.IO.BinaryReader import BinaryReader
+from neocore.IO.BinaryReader import BinaryReader
 from neo.IO.MemoryStream import StreamManager
 from neo.Core.FunctionCode import FunctionCode
 from enum import IntEnum
@@ -76,7 +76,7 @@ def Deserialize(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         super(ContractState, self).Deserialize(reader)
 

neo/Core/State/SpentCoinState.py

@@ -1,6 +1,6 @@
 from collections import namedtuple
 from .StateBase import StateBase
-from neo.IO.BinaryReader import BinaryReader
+from neocore.IO.BinaryReader import BinaryReader
 from neo.IO.MemoryStream import StreamManager
 
 
@@ -152,7 +152,7 @@ def Deserialize(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         super(SpentCoinState, self).Deserialize(reader)
 

neo/Core/State/StateBase.py

@@ -1,5 +1,5 @@
-from neo.IO.Mixins import SerializableMixin
-from neo.IO.BinaryWriter import BinaryWriter
+from neocore.IO.Mixins import SerializableMixin
+from neocore.IO.BinaryWriter import BinaryWriter
 from neo.IO.MemoryStream import StreamManager
 import ctypes
 
@@ -31,7 +31,7 @@ def Deserialize(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
 
         Raises:
             Exception: if the state version is incorrect.

neo/Core/State/StorageItem.py

@@ -1,5 +1,5 @@
 from .StateBase import StateBase
-from neo.IO.BinaryReader import BinaryReader
+from neocore.IO.BinaryReader import BinaryReader
 from neo.IO.MemoryStream import StreamManager
 
 
@@ -52,7 +52,7 @@ def Deserialize(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         super(StorageItem, self).Deserialize(reader)
         self.Value = reader.ReadVarBytes()

neo/Core/State/StorageKey.py

@@ -1,6 +1,6 @@
-from neo.IO.Mixins import SerializableMixin
+from neocore.IO.Mixins import SerializableMixin
 import mmh3
-from neo.BigInteger import BigInteger
+from neocore.BigInteger import BigInteger
 
 
 class StorageKey(SerializableMixin):
@@ -51,7 +51,7 @@ def Deserialize(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         self.ScriptHash = reader.ReadUInt160()
         self.Key = reader.ReadBytes()

neo/Core/State/UnspentCoinState.py

@@ -1,7 +1,7 @@
 import sys
 from .StateBase import StateBase
 from .CoinState import CoinState
-from neo.IO.BinaryReader import BinaryReader
+from neocore.IO.BinaryReader import BinaryReader
 from neo.IO.MemoryStream import StreamManager
 
 
@@ -72,7 +72,7 @@ def Deserialize(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         super(UnspentCoinState, self).Deserialize(reader)
 

neo/Core/State/ValidatorState.py

@@ -1,5 +1,5 @@
 from .StateBase import StateBase
-from neo.IO.BinaryReader import BinaryReader
+from neocore.IO.BinaryReader import BinaryReader
 from neo.IO.MemoryStream import StreamManager
 from neo.Cryptography.ECCurve import EllipticCurve, ECDSA
 
@@ -36,7 +36,7 @@ def Deserialize(self, reader):
         Deserialize full object.
 
         Args:
-            reader (neo.IO.BinaryReader):
+            reader (neocore.IO.BinaryReader):
         """
         super(ValidatorState, self).Deserialize(reader)
         self.PublicKey = ECDSA.Deserialize_Secp256r1(reader)

neo/Core/State/test_states.py

@@ -6,11 +6,11 @@
 from neo.Core.State.AssetState import AssetState
 from neo.Core.State.ContractState import ContractState
 from neo.Core.State.AccountState import AccountState
-from neo.UInt160 import UInt160
-from neo.Fixed8 import Fixed8
+from neocore.UInt160 import UInt160
+from neocore.Fixed8 import Fixed8
 from neo.IO.MemoryStream import StreamManager
-from neo.IO.BinaryReader import BinaryReader
-from neo.IO.BinaryWriter import BinaryWriter
+from neocore.IO.BinaryReader import BinaryReader
+from neocore.IO.BinaryWriter import BinaryWriter
 from neo.Core.Blockchain import Blockchain
 
 

neo/Core/TX/ClaimTransaction.py

@@ -1,5 +1,5 @@
 from neo.Core.TX.Transaction import *
-from neo.Fixed8 import Fixed8
+from neocore.Fixed8 import Fixed8
 from neo.Core.Blockchain import Blockchain
 from neo.Core.CoinReference import CoinReference
 

neo/Core/TX/EnrollmentTransaction.py

@@ -2,7 +2,7 @@
 import sys
 from neo.Cryptography.ECCurve import ECDSA
 from neo.Settings import settings
-from neo.Fixed8 import Fixed8
+from neocore.Fixed8 import Fixed8
 
 
 class EnrollmentTransaction(Transaction):

neo/Core/TX/InvocationTransaction.py

@@ -1,6 +1,6 @@
 from neo.Core.TX.Transaction import Transaction, TransactionType
 import sys
-from neo.Fixed8 import Fixed8
+from neocore.Fixed8 import Fixed8
 
 
 class InvocationTransaction(Transaction):

neo/Core/TX/IssueTransaction.py

@@ -7,7 +7,7 @@
 """
 from neo.Core.TX.Transaction import Transaction, TransactionType
 from neo.Settings import settings
-from neo.Fixed8 import Fixed8
+from neocore.Fixed8 import Fixed8
 from neo.Blockchain import GetSystemCoin, GetSystemShare
 
 

neo/Core/TX/MinerTransaction.py

@@ -1,7 +1,7 @@
 from neo.Core.TX.Transaction import Transaction, TransactionType
 import sys
 import binascii
-from neo.Fixed8 import Fixed8
+from neocore.Fixed8 import Fixed8
 
 
 class MinerTransaction(Transaction):

neo/Core/TX/PublishTransaction.py

@@ -2,7 +2,7 @@
 from neo.Core.TX.Transaction import Transaction, TransactionType
 from neo.Core.FunctionCode import FunctionCode
 from neo.Settings import settings
-from neo.Fixed8 import Fixed8
+from neocore.Fixed8 import Fixed8
 
 
 class PublishTransaction(Transaction):

neo/Core/TX/RegisterTransaction.py

@@ -10,7 +10,7 @@
 from neo.Cryptography.Crypto import Crypto
 from neo.Cryptography.ECCurve import EllipticCurve, ECDSA
 from neo.Settings import settings
-from neo.Fixed8 import Fixed8
+from neocore.Fixed8 import Fixed8
 
 
 class RegisterTransaction(Transaction):

neo/Core/TX/Transaction.py

@@ -8,18 +8,18 @@
 from itertools import groupby
 from neo.Blockchain import *
 from neo.Core.TX.TransactionAttribute import *
-from neo.Fixed8 import Fixed8
+from neocore.Fixed8 import Fixed8
 from neo.Network.Inventory import Inventory
 from neo.Network.InventoryType import InventoryType
 from neo.Network.Mixins import InventoryMixin
 from neo.Cryptography.Crypto import *
-from neo.IO.Mixins import SerializableMixin
+from neocore.IO.Mixins import SerializableMixin
 from neo.IO.MemoryStream import StreamManager
-from neo.IO.BinaryReader import BinaryReader
+from neocore.IO.BinaryReader import BinaryReader
 from neo.Core.Mixins import EquatableMixin
 from neo.Core.Helper import Helper
 from neo.Core.Witness import Witness
-from neo.UInt256 import UInt256
+from neocore.UInt256 import UInt256
 from neo.Core.AssetType import AssetType
 
 

neo/Core/TX/TransactionAttribute.py

@@ -7,7 +7,7 @@
 """
 from logzero import logger
 from neo.Network.Inventory import Inventory
-from neo.IO.Mixins import SerializableMixin
+from neocore.IO.Mixins import SerializableMixin
 
 
 class TransactionAttributeUsage(object):

neo/Core/TX/test_transactions.py

@@ -1,8 +1,8 @@
 from neo.Utils.NeoTestCase import NeoTestCase
 from neo.Core.TX.MinerTransaction import MinerTransaction
 from neo.Core.TX.Transaction import Transaction
-from neo.IO.BinaryWriter import BinaryWriter
-from neo.IO.BinaryReader import BinaryReader
+from neocore.IO.BinaryWriter import BinaryWriter
+from neocore.IO.BinaryReader import BinaryReader
 from neo.IO.MemoryStream import MemoryStream, StreamManager
 import binascii
 import json

neo/Core/Witness.py

@@ -4,7 +4,7 @@
 
 from logzero import logger
 
-from neo.IO.Mixins import SerializableMixin
+from neocore.IO.Mixins import SerializableMixin
 
 
 class Witness(SerializableMixin):

neo/Core/test_block_hash.py

@@ -1,7 +1,7 @@
 from neo.Utils.NeoTestCase import NeoTestCase
 import binascii
 from neo.Cryptography.Helper import *
-from neo.UInt256 import UInt256
+from neocore.UInt256 import UInt256
 
 
 class BlockHashTest(NeoTestCase):

neo/Cryptography/Crypto.py

@@ -2,7 +2,7 @@
 from ecdsa import NIST256p, VerifyingKey
 from logzero import logger
 from .Helper import *
-from neo.UInt160 import UInt160
+from neocore.UInt160 import UInt160
 from neo.Cryptography.ECCurve import EllipticCurve
 
 

neo/Cryptography/MerkleTree.py

@@ -1,5 +1,5 @@
 from neo.Cryptography.Crypto import *
-from neo.UInt256 import UInt256
+from neocore.UInt256 import UInt256
 
 
 class MerkleTreeNode(object):