Code cleanup, remove unused Exception and move ISerializable to its o…

…wn file
AElfProject · Feb 2, 2018 · 9533f1c · 9533f1c
1 parent 5c88f12
commit 9533f1c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 20 deletions.
diff --git a/AElf.Kernel/AELFException.cs b/AElf.Kernel/AELFException.cs
diff --git a/AElf.Kernel/IAccountDataProvider.cs b/AElf.Kernel/IAccountDataProvider.cs
@@ -2,12 +2,6 @@
 
 namespace AElf.Kernel
 {
-
-    public interface ISerializable
-    {
-        byte[] Serialize();
-    }
-
     /// <summary>
     /// Data is stored associated with Account
     /// </summary>

diff --git a/AElf.Kernel/ISerializable.cs b/AElf.Kernel/ISerializable.cs
@@ -0,0 +1,7 @@
+namespace AElf.Kernel
+{
+    public interface ISerializable
+    {
+        byte[] Serialize();
+    }
+}
diff --git a/AElf.Kernel/KernelAccount/SmartContractInvokerZero.cs b/AElf.Kernel/KernelAccount/SmartContractInvokerZero.cs
@@ -5,7 +5,6 @@ namespace AElf.Kernel.KernelAccount
 {
     public class SmartContractInvokerZero : ISmartContractInvoker
     {
-
         private SmartContractZero _contract;
         private readonly string _methodName;
         private readonly object[] _objs;

diff --git a/AElf.Kernel/Merkle/MerkleNode.cs b/AElf.Kernel/Merkle/MerkleNode.cs
@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
@@ -43,7 +44,7 @@ public void SetLeftNode(MerkleNode left)
         {
             if (left.Hash == null)
             {
-                throw new AELFException("Merkle node did not initialized.");
+                throw new InvalidOperationException("Merkle node did not initialized.");
             }
             LeftNode = left;
             LeftNode.ParentNode = this;
@@ -58,7 +59,7 @@ public void SetRightNode(MerkleNode right)
         {
             if (right.Hash == null)
             {
-                throw new AELFException("Merkle node did not initialized.");
+                throw new InvalidOperationException("Merkle node did not initialized.");
             }
             RightNode = right;
             RightNode.ParentNode = this;

diff --git a/AElf.Kernel/Merkle/MerkleTree.cs b/AElf.Kernel/Merkle/MerkleTree.cs
@@ -45,7 +45,7 @@ public IHash<IMerkleTree<T>> ComputeRootHash(List<IHash<T>> hashes)
         {
             if (hashes.Count < 1)
             {
-                throw new AELFException("Cannot generate merkle tree without any nodes.");
+                throw new InvalidOperationException("Cannot generate merkle tree without any nodes.");
             }
 
             if (hashes.Count == 1)//Finally