refactoring

neo.UnitTests/README.md

@@ -28,7 +28,6 @@ Coverage
 	* Header.cs
 	* Helper.cs
 	* InvocationTransaction.cs
-	* IssueTransaction.cs
 	* MinerTransaction.cs
 	* SpentCoin.cs
 	* SpentCoinState.cs

neo.UnitTests/TestMetaDataCache.cs

@@ -3,16 +3,24 @@
 
 namespace Neo.UnitTests
 {
-    public class TestMetaDataCache<T> : MetaDataCache<T> where T : class, ISerializable, new()
+    public class TestMetaDataCache<T> : MetaDataCache<T> where T : class, ICloneable<T>, ISerializable, new()
     {
         public TestMetaDataCache()
             : base(null)
         {
         }
 
+        protected override void AddInternal(T item)
+        {
+        }
+
         protected override T TryGetInternal()
         {
             return null;
         }
+
+        protected override void UpdateInternal(T item)
+        {
+        }
     }
 }

neo.UnitTests/TestTransaction.cs

@@ -1,7 +1,4 @@
-using Neo.Core;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using Neo.Network.P2P.Payloads;
 
 namespace Neo.UnitTests
 {

neo.UnitTests/TestUtils.cs

@@ -1,9 +1,7 @@
-using System;
-using Neo.Core;
-using Neo.Cryptography.ECC;
+using Neo.Cryptography.ECC;
+using Neo.Network.P2P.Payloads;
 using Neo.VM;
-using Neo.Wallets;
-using Neo.SmartContract;
+using System;
 
 namespace Neo.UnitTests
 {
@@ -30,7 +28,7 @@ public static ClaimTransaction GetClaimTransaction()
                 Attributes = new TransactionAttribute[0],
                 Inputs = new CoinReference[0],
                 Outputs = new TransactionOutput[0],
-                Scripts = new Witness[0]
+                Witnesses = new Witness[0]
             };
         }
 
@@ -42,48 +40,7 @@ public static MinerTransaction GetMinerTransaction()
                 Attributes = new TransactionAttribute[0],
                 Inputs = new CoinReference[0],
                 Outputs = new TransactionOutput[0],
-                Scripts = new Witness[0]
-            };
-        }
-
-        public static IssueTransaction GetIssueTransaction(bool inputVal, decimal outputVal, UInt256 assetId)
-        {
-            TestUtils.SetupTestBlockchain(assetId);
-
-            CoinReference[] inputsVal;
-            if (inputVal)
-            {
-                inputsVal = new[]
-                {
-                    TestUtils.GetCoinReference(null)
-                };
-            }
-            else
-            {
-                inputsVal = new CoinReference[0];
-            }
-
-            return new IssueTransaction
-            {
-                Attributes = new TransactionAttribute[0],
-                Inputs = inputsVal,
-                Outputs = new[]
-                {
-                    new TransactionOutput
-                    {
-                        AssetId = assetId,
-                        Value = Fixed8.FromDecimal(outputVal),
-                        ScriptHash = Contract.CreateMultiSigRedeemScript(1, TestUtils.StandbyValidators).ToScriptHash()
-                    }
-                },
-                Scripts = new[]
-                {
-                    new Witness
-                    {
-                        InvocationScript = new byte[0],
-                        VerificationScript = new[] { (byte)OpCode.PUSHT }
-                    }
-                }
+                Witnesses = new Witness[0]
             };
         }
 
@@ -97,12 +54,6 @@ public static CoinReference GetCoinReference(UInt256 prevHash)
             };
         }
 
-        public static void SetupTestBlockchain(UInt256 assetId)
-        {
-            Blockchain testBlockchain = new TestBlockchain(assetId);
-            Blockchain.RegisterBlockchain(testBlockchain);
-        }
-
         public static void SetupHeaderWithValues(Header header, UInt256 val256, out UInt256 merkRootVal, out UInt160 val160, out uint timestampVal, out uint indexVal, out ulong consensusDataVal, out Witness scriptVal)
         {
             setupBlockBaseWithValues(header, val256, out merkRootVal, out val160, out timestampVal, out indexVal, out consensusDataVal, out scriptVal);
@@ -142,7 +93,7 @@ private static void setupBlockBaseWithValues(BlockBase bb, UInt256 val256, out U
                 InvocationScript = new byte[0],
                 VerificationScript = new[] { (byte)OpCode.PUSHT }
             };
-            bb.Script = scriptVal;
+            bb.Witness = scriptVal;
         }
     }    
 }

neo.UnitTests/TestVerifiable.cs

@@ -1,14 +1,15 @@
+using Neo.Network.P2P.Payloads;
+using Neo.Persistence;
 using System;
 using System.IO;
-using Neo.Core;
 
 namespace Neo.UnitTests
 {
     public class TestVerifiable : IVerifiable
     {
         private string testStr = "testStr";
 
-        public Witness[] Scripts { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public Witness[] Witnesses { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
         public int Size => throw new NotImplementedException();
 
@@ -27,7 +28,7 @@ public byte[] GetMessage()
             throw new NotImplementedException();
         }
 
-        public UInt160[] GetScriptHashesForVerifying()
+        public UInt160[] GetScriptHashesForVerifying(Snapshot snapshot)
         {
             throw new NotImplementedException();
         }

neo.UnitTests/UT_AccountState.cs

@@ -1,8 +1,8 @@
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Core;
 using Neo.Cryptography.ECC;
 using Neo.IO;
+using Neo.Ledger;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;

neo.UnitTests/UT_AssetState.cs

@@ -1,8 +1,9 @@
 using FluentAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Neo.Core;
 using Neo.Cryptography.ECC;
 using Neo.IO;
+using Neo.Ledger;
+using Neo.Network.P2P.Payloads;
 using System.Globalization;
 using System.IO;
 using System.Text;