From 100c6ed3d220fd1aa1ddcccaab3af9734905194b Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Tue, 1 Sep 2015 10:12:42 +0300 Subject: [PATCH] Cosmetic changes. --- Novacoin/CBlockHeader.cs | 30 +++++++++++++++--------------- Novacoin/COutPoint.cs | 2 +- Novacoin/CTransaction.cs | 6 +++--- Novacoin/CTxIn.cs | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Novacoin/CBlockHeader.cs b/Novacoin/CBlockHeader.cs index 29abc7d..e5557c3 100644 --- a/Novacoin/CBlockHeader.cs +++ b/Novacoin/CBlockHeader.cs @@ -72,14 +72,14 @@ namespace Novacoin nNonce = 0; } - public CBlockHeader(CBlockHeader h) + public CBlockHeader(CBlockHeader header) { - nVersion = h.nVersion; - prevHash = new ScryptHash256(h.prevHash); - merkleRoot = new Hash256(h.merkleRoot); - nTime = h.nTime; - nBits = h.nBits; - nNonce = h.nNonce; + nVersion = header.nVersion; + prevHash = new ScryptHash256(header.prevHash); + merkleRoot = new Hash256(header.merkleRoot); + nTime = header.nTime; + nBits = header.nBits; + nNonce = header.nNonce; } internal CBlockHeader(ref BinaryReader reader) @@ -117,17 +117,17 @@ namespace Novacoin /// Convert current block header instance into sequence of bytes /// /// Byte sequence - public static implicit operator byte[] (CBlockHeader h) + public static implicit operator byte[] (CBlockHeader header) { var stream = new MemoryStream(); var writer = new BinaryWriter(stream); - writer.Write(h.nVersion); - writer.Write(h.prevHash); - writer.Write(h.merkleRoot); - writer.Write(h.nTime); - writer.Write(h.nBits); - writer.Write(h.nNonce); + writer.Write(header.nVersion); + writer.Write(header.prevHash); + writer.Write(header.merkleRoot); + writer.Write(header.nTime); + writer.Write(header.nBits); + writer.Write(header.nNonce); var resultBytes = stream.ToArray(); @@ -146,7 +146,7 @@ namespace Novacoin public override string ToString() { var sb = new StringBuilder(); - sb.AppendFormat("CBlockHeader(nVersion={0}, prevHash={1}, merkleRoot={2}, nTime={3}, nBits={4}, nNonce={5})", nVersion, prevHash.ToString(), merkleRoot.ToString(), nTime, nBits, nNonce); + sb.AppendFormat("CBlockHeader(nVersion={0}, prevHash={1}, merkleRoot={2}, nTime={3}, nBits={4}, nNonce={5})", nVersion, prevHash, merkleRoot, nTime, nBits, nNonce); return sb.ToString(); } } diff --git a/Novacoin/COutPoint.cs b/Novacoin/COutPoint.cs index ddb40e8..9e628e9 100644 --- a/Novacoin/COutPoint.cs +++ b/Novacoin/COutPoint.cs @@ -90,7 +90,7 @@ namespace Novacoin public override string ToString() { var sb = new StringBuilder(); - sb.AppendFormat("COutPoint({0}, {1})", hash.ToString(), n); + sb.AppendFormat("COutPoint({0}, {1})", hash, n); return sb.ToString(); } diff --git a/Novacoin/CTransaction.cs b/Novacoin/CTransaction.cs index ef444f2..fd62f41 100644 --- a/Novacoin/CTransaction.cs +++ b/Novacoin/CTransaction.cs @@ -42,7 +42,7 @@ namespace Novacoin } /// - /// Represents the transaction. Any transaction must provide one input and one output at least. + /// Represents the transaction. /// public class CTransaction { @@ -437,12 +437,12 @@ namespace Novacoin foreach (var txin in vin) { - sb.AppendFormat(" {0},\n", txin.ToString()); + sb.AppendFormat(" {0},\n", txin); } foreach (var txout in vout) { - sb.AppendFormat(" {0},\n", txout.ToString()); + sb.AppendFormat(" {0},\n", txout); } sb.AppendFormat("\nnLockTime={0}\n)", nLockTime); diff --git a/Novacoin/CTxIn.cs b/Novacoin/CTxIn.cs index 376f27f..94cd8b1 100644 --- a/Novacoin/CTxIn.cs +++ b/Novacoin/CTxIn.cs @@ -162,7 +162,7 @@ namespace Novacoin } else { - sb.AppendFormat(", scriptsig={0}", scriptSig.ToString()); + sb.AppendFormat(", scriptsig={0}", scriptSig); } if (nSequence != uint.MaxValue) -- 1.7.1