Remove Hash, Hash256, Hash160 and ScryptHash256 classes.

[NovacoinLibrary.git] / Novacoin / CKey.cs

diff --git a/Novacoin/CKey.cs b/Novacoin/CKey.cs
index a24d6c8..672f0be 100644 (file)
--- a/Novacoin/CKey.cs
+++ b/Novacoin/CKey.cs
@@ -71,7 +71,7 @@ namespace Novacoin
                 return pubKeyParams;
             }
 
-            ECPoint q = new FpPoint(curve.Curve, pubKeyParams.Q.X, pubKeyParams.Q.Y, false);
+            var q = new FpPoint(curve.Curve, pubKeyParams.Q.X, pubKeyParams.Q.Y, false);
 
             return new ECPublicKeyParameters(q, domain);
         }
@@ -82,13 +82,13 @@ namespace Novacoin
         /// <param name="sigHash">Data hash</param>
         /// <param name="signature">Signature bytes</param>
         /// <returns>Checking result</returns>
-        public bool VerifySignature(Hash sigHash, IEnumerable<byte> signature)
+        public bool VerifySignature(uint256 sigHash, byte[] signature)
         {
-            ISigner signer = SignerUtilities.GetSigner("NONEwithECDSA");
+            var signer = SignerUtilities.GetSigner("NONEwithECDSA");
             signer.Init(false, _Public);
-            signer.BlockUpdate(sigHash.hashBytes, 0, sigHash.hashSize);
+            signer.BlockUpdate(sigHash, 0, sigHash.Size);
 
-            return signer.VerifySignature(signature.ToArray());
+            return signer.VerifySignature(signature);
         }
 
         /// <summary>
@@ -97,15 +97,7 @@ namespace Novacoin
         /// <returns>New key ID</returns>
         public CKeyID KeyID
         {
-            get { return new CKeyID(Hash160.Compute160(PublicBytes)); }
-        }
-
-        /// <summary>
-        /// PublicBytes part of key pair
-        /// </summary>
-        public IEnumerable<byte> PublicBytes
-        {
-            get { return _Public.Q.GetEncoded(); }
+            get { return new CKeyID(CryptoUtils.ComputeHash160(_Public.Q.GetEncoded())); }
         }
 
         /// <summary>