Revert "dotnet format (#1054)"

This reverts commit 34faf4e.

neo.UnitTests/Network/P2P/Payloads/UT_Witness.cs

@@ -122,7 +122,7 @@ public void MaxSize_OK()
             witness.Size.Should().Be(1003);
             witness.InvocationScript.GetVarSize().Should().Be(653);
             witness.VerificationScript.GetVarSize().Should().Be(350);
-
+            
             Assert.IsTrue(witness.Size <= 1024);
 
             var copy = witness.ToArray().AsSerializable<Witness>();

neo.UnitTests/Wallets/NEP6/UT_NEP6Account.cs

@@ -18,8 +18,7 @@ public class UT_NEP6Account
         private static KeyPair keyPair;
 
         [ClassInitialize]
-        public static void ClassSetup(TestContext context)
-        {
+        public static void ClassSetup(TestContext context) {
             byte[] privateKey = { 0x01,0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
                 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01};
             keyPair = new KeyPair(privateKey);

neo/BigDecimal.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Numerics;
 
 namespace Neo

neo/Consensus/ChangeView.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 namespace Neo.Consensus
 {

neo/Consensus/ChangeViewReason.cs

@@ -1,4 +1,4 @@
-namespace Neo.Consensus
+namespace Neo.Consensus
 {
     public enum ChangeViewReason : byte
     {

neo/Consensus/Commit.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 namespace Neo.Consensus
 {

neo/Consensus/ConsensusContext.cs

@@ -6,7 +6,7 @@
 using Neo.Persistence;
 using Neo.SmartContract;
 using Neo.SmartContract.Native;
-using Neo.VM;
+using Neo.VM;
 using Neo.Wallets;
 using System;
 using System.Collections.Generic;
@@ -39,11 +39,11 @@ internal class ConsensusContext : IDisposable, ISerializable
 
         public Snapshot Snapshot { get; private set; }
         private KeyPair keyPair;
-        private int _witnessSize;
+        private int _witnessSize;
         private readonly Wallet wallet;
         private readonly Store store;
         private readonly Random random = new Random();
-
+
         public int F => (Validators.Length - 1) / 3;
         public int M => Validators.Length - F;
         public bool IsPrimary => MyIndex == Block.ConsensusData.PrimaryIndex;
@@ -205,40 +205,40 @@ private void SignPayload(ConsensusPayload payload)
                 return;
             }
             payload.Witness = sc.GetWitnesses()[0];
-        }
-
+        }
+
         /// <summary>
         /// Return the expected block size
         /// </summary>
-        internal int GetExpectedBlockSize()
-        {
-            return GetExpectedBlockSizeWithoutTransactions(Transactions.Count) + // Base size
-                Transactions.Values.Sum(u => u.Size);   // Sum Txs
+        internal int GetExpectedBlockSize()
+        {
+            return GetExpectedBlockSizeWithoutTransactions(Transactions.Count) + // Base size
+                Transactions.Values.Sum(u => u.Size);   // Sum Txs
         }
 
-        /// <summary>
-        /// Return the expected block size without txs
-        /// </summary>
-        /// <param name="expectedTransactions">Expected transactions</param>
-        internal int GetExpectedBlockSizeWithoutTransactions(int expectedTransactions)
-        {
-            var blockSize =
-                // BlockBase
-                sizeof(uint) +       //Version
-                UInt256.Length +     //PrevHash
-                UInt256.Length +     //MerkleRoot
-                sizeof(ulong) +      //Timestamp
-                sizeof(uint) +       //Index
-                UInt160.Length +     //NextConsensus
-                1 +                  //
-                _witnessSize;        //Witness
-
-            blockSize +=
-                // Block
-                Block.ConsensusData.Size +                      //ConsensusData
-                IO.Helper.GetVarSize(expectedTransactions + 1); //Transactions count
-
-            return blockSize;
+        /// <summary>
+        /// Return the expected block size without txs
+        /// </summary>
+        /// <param name="expectedTransactions">Expected transactions</param>
+        internal int GetExpectedBlockSizeWithoutTransactions(int expectedTransactions)
+        {
+            var blockSize =
+                // BlockBase
+                sizeof(uint) +       //Version
+                UInt256.Length +     //PrevHash
+                UInt256.Length +     //MerkleRoot
+                sizeof(ulong) +      //Timestamp
+                sizeof(uint) +       //Index
+                UInt160.Length +     //NextConsensus
+                1 +                  //
+                _witnessSize;        //Witness
+
+            blockSize +=
+                // Block
+                Block.ConsensusData.Size +                      //ConsensusData
+                IO.Helper.GetVarSize(expectedTransactions + 1); //Transactions count
+
+            return blockSize;
         }
 
         /// <summary>
@@ -247,18 +247,18 @@ internal int GetExpectedBlockSizeWithoutTransactions(int expectedTransactions)
         /// <param name="txs">Ordered transactions</param>
         internal void EnsureMaxBlockSize(IEnumerable<Transaction> txs)
         {
-            uint maxBlockSize = NativeContract.Policy.GetMaxBlockSize(Snapshot);
-            uint maxTransactionsPerBlock = NativeContract.Policy.GetMaxTransactionsPerBlock(Snapshot);
+            uint maxBlockSize = NativeContract.Policy.GetMaxBlockSize(Snapshot);
+            uint maxTransactionsPerBlock = NativeContract.Policy.GetMaxTransactionsPerBlock(Snapshot);
 
             // Limit Speaker proposal to the limit `MaxTransactionsPerBlock` or all available transactions of the mempool
             txs = txs.Take((int)maxTransactionsPerBlock);
             List<UInt256> hashes = new List<UInt256>();
             Transactions = new Dictionary<UInt256, Transaction>();
-            Block.Transactions = new Transaction[0];
-
-            // We need to know the expected block size
-
-            var blockSize = GetExpectedBlockSizeWithoutTransactions(txs.Count());
+            Block.Transactions = new Transaction[0];
+
+            // We need to know the expected block size
+
+            var blockSize = GetExpectedBlockSizeWithoutTransactions(txs.Count());
 
             // Iterate transaction until reach the size
 
@@ -271,8 +271,8 @@ internal void EnsureMaxBlockSize(IEnumerable<Transaction> txs)
                 hashes.Add(tx.Hash);
                 Transactions.Add(tx.Hash, tx);
             }
-
-            TransactionHashes = hashes.ToArray();
+
+            TransactionHashes = hashes.ToArray();
         }
 
         public ConsensusPayload MakePrepareRequest()
@@ -281,8 +281,8 @@ public ConsensusPayload MakePrepareRequest()
             random.NextBytes(buffer);
             Block.ConsensusData.Nonce = BitConverter.ToUInt64(buffer, 0);
             EnsureMaxBlockSize(Blockchain.Singleton.MemPool.GetSortedVerifiedTransactions());
-            Block.Timestamp = Math.Max(TimeProvider.Current.UtcNow.ToTimestampMS(), PrevHeader.Timestamp + 1);
-
+            Block.Timestamp = Math.Max(TimeProvider.Current.UtcNow.ToTimestampMS(), PrevHeader.Timestamp + 1);
+
             return PreparationPayloads[MyIndex] = MakeSignedPayload(new PrepareRequest
             {
                 Timestamp = Block.Timestamp,
@@ -348,21 +348,21 @@ public void Reset(byte viewNumber)
                 };
                 var pv = Validators;
                 Validators = NativeContract.NEO.GetNextBlockValidators(Snapshot);
-                if (_witnessSize == 0 || (pv != null && pv.Length != Validators.Length))
-                {
-                    // Compute the expected size of the witness
-                    using (ScriptBuilder sb = new ScriptBuilder())
-                    {
-                        for (int x = 0; x < M; x++)
-                        {
-                            sb.EmitPush(new byte[64]);
-                        }
-                        _witnessSize = new Witness
-                        {
-                            InvocationScript = sb.ToArray(),
-                            VerificationScript = Contract.CreateMultiSigRedeemScript(M, Validators)
-                        }.Size;
-                    }
+                if (_witnessSize == 0 || (pv != null && pv.Length != Validators.Length))
+                {
+                    // Compute the expected size of the witness
+                    using (ScriptBuilder sb = new ScriptBuilder())
+                    {
+                        for (int x = 0; x < M; x++)
+                        {
+                            sb.EmitPush(new byte[64]);
+                        }
+                        _witnessSize = new Witness
+                        {
+                            InvocationScript = sb.ToArray(),
+                            VerificationScript = Contract.CreateMultiSigRedeemScript(M, Validators)
+                        }.Size;
+                    }
                 }
                 MyIndex = -1;
                 ChangeViewPayloads = new ConsensusPayload[Validators.Length];

neo/Consensus/ConsensusMessage.cs

@@ -1,4 +1,4 @@
-using Neo.IO;
+using Neo.IO;
 using Neo.IO.Caching;
 using System;
 using System.IO;

neo/Consensus/ConsensusMessageType.cs

@@ -1,4 +1,4 @@
-using Neo.IO.Caching;
+using Neo.IO.Caching;
 
 namespace Neo.Consensus
 {

neo/Consensus/ConsensusService.cs

@@ -1,4 +1,4 @@
-using Akka.Actor;
+using Akka.Actor;
 using Akka.Configuration;
 using Neo.Cryptography;
 using Neo.IO;

neo/Consensus/PrepareRequest.cs

@@ -1,4 +1,4 @@
-using Neo.IO;
+using Neo.IO;
 using Neo.Network.P2P.Payloads;
 using System;
 using System.IO;

neo/Consensus/PrepareResponse.cs

@@ -1,4 +1,4 @@
-using Neo.IO;
+using Neo.IO;
 using System.IO;
 
 namespace Neo.Consensus

neo/Consensus/RecoveryMessage.ChangeViewPayloadCompact.cs

@@ -1,4 +1,4 @@
-using Neo.IO;
+using Neo.IO;
 using Neo.Network.P2P.Payloads;
 using System.IO;
 

neo/Consensus/RecoveryMessage.CommitPayloadCompact.cs

@@ -1,4 +1,4 @@
-using Neo.IO;
+using Neo.IO;
 using Neo.Network.P2P.Payloads;
 using System.IO;
 

neo/Consensus/RecoveryMessage.PreparationPayloadCompact.cs

@@ -1,4 +1,4 @@
-using Neo.IO;
+using Neo.IO;
 using Neo.Network.P2P.Payloads;
 using System.IO;
 

neo/Consensus/RecoveryMessage.cs

@@ -1,4 +1,4 @@
-using Neo.IO;
+using Neo.IO;
 using Neo.Ledger;
 using Neo.Network.P2P.Payloads;
 using Neo.SmartContract;

neo/Consensus/RecoveryRequest.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 
 namespace Neo.Consensus
 {

neo/Cryptography/Base58.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Numerics;
 using System.Text;

neo/Cryptography/BloomFilter.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Linq;
 
 namespace Neo.Cryptography

neo/Cryptography/Crypto.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Security.Cryptography;
 

neo/Cryptography/ECC/ECCurve.cs

@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
 using System.Numerics;
 
 namespace Neo.Cryptography.ECC

neo/Cryptography/ECC/ECDsa.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Numerics;
 using System.Security.Cryptography;

neo/Cryptography/ECC/ECFieldElement.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Numerics;
 

neo/Cryptography/ECC/ECPoint.cs

@@ -1,4 +1,4 @@
-using Neo.IO;
+using Neo.IO;
 using System;
 using System.IO;
 using System.Linq;

neo/Cryptography/Helper.cs

@@ -1,4 +1,4 @@
-using Neo.IO;
+using Neo.IO;
 using Neo.Network.P2P.Payloads;
 using System;
 using System.Collections.Generic;

neo/Cryptography/MerkleTree.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;

neo/Cryptography/MerkleTreeNode.cs

@@ -1,4 +1,4 @@
-namespace Neo.Cryptography
+namespace Neo.Cryptography
 {
     internal class MerkleTreeNode
     {

neo/Cryptography/Murmur3.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 

neo/Cryptography/RIPEMD160Managed.cs

@@ -1,4 +1,4 @@
-#if !NET47
+#if !NET47
 using System;
 using System.Runtime.InteropServices;
 using System.Security;

neo/Cryptography/SCrypt.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Security.Cryptography;
 
 namespace Neo.Cryptography

neo/Helper.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Neo.Plugins;
 using System;
 using System.Collections.Generic;

neo/IO/Actors/Idle.cs

@@ -1,4 +1,4 @@
-namespace Neo.IO.Actors
+namespace Neo.IO.Actors
 {
     internal sealed class Idle
     {

neo/IO/Actors/PriorityMailbox.cs

@@ -1,4 +1,4 @@
-using Akka.Actor;
+using Akka.Actor;
 using Akka.Configuration;
 using Akka.Dispatch;
 using Akka.Dispatch.MessageQueues;

neo/IO/Actors/PriorityMessageQueue.cs

@@ -1,4 +1,4 @@
-using Akka.Actor;
+using Akka.Actor;
 using Akka.Dispatch;
 using Akka.Dispatch.MessageQueues;
 using System;

neo/IO/ByteArrayComparer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace Neo.IO

neo/IO/Caching/Cache.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;