diff --git a/neo.UnitTests/UT_ConsensusServiceMailbox.cs b/neo.UnitTests/UT_ConsensusServiceMailbox.cs index 4000b99f61..fded2ab54e 100644 --- a/neo.UnitTests/UT_ConsensusServiceMailbox.cs +++ b/neo.UnitTests/UT_ConsensusServiceMailbox.cs @@ -13,7 +13,7 @@ namespace Neo.UnitTests { [TestClass] - public class UT_ConsensusServiceMailbox : TestKit + public class UT_ConsensusServiceMailbox : TestKit { private static readonly Random TestRandom = new Random(1337); // use fixed seed for guaranteed determinism @@ -42,10 +42,10 @@ public void ConsensusServiceMailbox_Test_IsHighPriority() uut.IsHighPriority(new ConsensusService.SetViewNumber()).Should().Be(true); uut.IsHighPriority(new ConsensusService.Timer()).Should().Be(true); uut.IsHighPriority(new Blockchain.PersistCompleted()).Should().Be(true); - + // any random object should not have priority object obj = null; - uut.IsHighPriority(obj).Should().Be(false); + uut.IsHighPriority(obj).Should().Be(false); } } } diff --git a/neo.UnitTests/UT_ProtocolHandlerMailbox.cs b/neo.UnitTests/UT_ProtocolHandlerMailbox.cs index 4645e3cfdc..edd5a4191f 100644 --- a/neo.UnitTests/UT_ProtocolHandlerMailbox.cs +++ b/neo.UnitTests/UT_ProtocolHandlerMailbox.cs @@ -15,7 +15,7 @@ namespace Neo.UnitTests { [TestClass] - public class UT_ProtocolHandlerMailbox : TestKit + public class UT_ProtocolHandlerMailbox : TestKit { private static readonly Random TestRandom = new Random(1337); // use fixed seed for guaranteed determinism @@ -96,99 +96,99 @@ public void ProtocolHandlerMailbox_Test_ShallDrop() // Version (no drop) msg = Message.Create(MessageCommand.Version, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); // Verack (no drop) msg = Message.Create(MessageCommand.Verack, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); //connectivity // GetAddr (drop) msg = Message.Create(MessageCommand.GetAddr, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(true); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(true); // Addr (no drop) msg = Message.Create(MessageCommand.Addr, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); // Ping (no drop) msg = Message.Create(MessageCommand.Ping, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); // Pong (no drop) msg = Message.Create(MessageCommand.Pong, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); //synchronization // GetHeaders (drop) msg = Message.Create(MessageCommand.GetHeaders, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(true); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(true); // Headers (no drop) msg = Message.Create(MessageCommand.Headers, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); // GetBlocks (drop) msg = Message.Create(MessageCommand.GetBlocks, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(true); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(true); // Mempool (drop) msg = Message.Create(MessageCommand.Mempool, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(true); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(true); // Inv (no drop) msg = Message.Create(MessageCommand.Inv, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); // GetData (drop) msg = Message.Create(MessageCommand.GetData, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(true); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(true); // NotFound (no drop) msg = Message.Create(MessageCommand.NotFound, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); // Transaction (no drop) msg = Message.Create(MessageCommand.Transaction, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); // Block (no drop) msg = Message.Create(MessageCommand.Block, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); // Consensus (no drop) msg = Message.Create(MessageCommand.Consensus, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); // Reject (no drop) msg = Message.Create(MessageCommand.Reject, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); //SPV protocol // FilterLoad (no drop) msg = Message.Create(MessageCommand.FilterLoad, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); // FilterAdd (no drop) msg = Message.Create(MessageCommand.FilterAdd, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); // FilterClear (no drop) msg = Message.Create(MessageCommand.FilterClear, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); // MerkleBlock (no drop) msg = Message.Create(MessageCommand.MerkleBlock, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); //others // Alert (no drop) msg = Message.Create(MessageCommand.Alert, s); uut.ShallDrop(msg, emptyQueue).Should().Be(false); - uut.ShallDrop(msg, new object[]{ msg }).Should().Be(false); + uut.ShallDrop(msg, new object[] { msg }).Should().Be(false); } } } diff --git a/neo.UnitTests/UT_RemoteNodeMailbox.cs b/neo.UnitTests/UT_RemoteNodeMailbox.cs index 9b35bf44e0..3e9e8a7c3b 100644 --- a/neo.UnitTests/UT_RemoteNodeMailbox.cs +++ b/neo.UnitTests/UT_RemoteNodeMailbox.cs @@ -15,7 +15,7 @@ namespace Neo.UnitTests { [TestClass] - public class UT_RemoteNodeMailbox : TestKit + public class UT_RemoteNodeMailbox : TestKit { private static readonly Random TestRandom = new Random(1337); // use fixed seed for guaranteed determinism diff --git a/neo.UnitTests/UT_StorageItem.cs b/neo.UnitTests/UT_StorageItem.cs index 602a46ed11..c7372eb455 100644 --- a/neo.UnitTests/UT_StorageItem.cs +++ b/neo.UnitTests/UT_StorageItem.cs @@ -27,7 +27,7 @@ public void Value_Get() [TestMethod] public void Value_Set() { - byte[] val = new byte[] { 0x42, 0x32}; + byte[] val = new byte[] { 0x42, 0x32 }; uut.Value = val; uut.Value.Length.Should().Be(2); uut.Value[0].Should().Be(val[0]); @@ -56,7 +56,7 @@ public void Clone() StorageItem newSi = ((ICloneable)uut).Clone(); newSi.Value.Length.Should().Be(10); newSi.Value[0].Should().Be(0x42); - for (int i=1; i<10; i++) + for (int i = 1; i < 10; i++) { newSi.Value[i].Should().Be(0x20); } diff --git a/neo.UnitTests/UT_TaskManagerMailbox.cs b/neo.UnitTests/UT_TaskManagerMailbox.cs index 17244d80d9..2ba4ff2d85 100644 --- a/neo.UnitTests/UT_TaskManagerMailbox.cs +++ b/neo.UnitTests/UT_TaskManagerMailbox.cs @@ -12,7 +12,7 @@ namespace Neo.UnitTests { [TestClass] - public class UT_TaskManagerMailbox : TestKit + public class UT_TaskManagerMailbox : TestKit { private static readonly Random TestRandom = new Random(1337); // use fixed seed for guaranteed determinism @@ -42,12 +42,12 @@ public void TaskManager_Test_IsHighPriority() // low priority // -> NewTasks: generic InvPayload - uut.IsHighPriority(new TaskManager.NewTasks{ Payload = new InvPayload() }).Should().Be(false); + uut.IsHighPriority(new TaskManager.NewTasks { Payload = new InvPayload() }).Should().Be(false); // high priority // -> NewTasks: payload Block or Consensus - uut.IsHighPriority(new TaskManager.NewTasks{ Payload = new InvPayload{ Type = InventoryType.Block } }).Should().Be(true); - uut.IsHighPriority(new TaskManager.NewTasks{ Payload = new InvPayload{ Type = InventoryType.Consensus } }).Should().Be(true); + uut.IsHighPriority(new TaskManager.NewTasks { Payload = new InvPayload { Type = InventoryType.Block } }).Should().Be(true); + uut.IsHighPriority(new TaskManager.NewTasks { Payload = new InvPayload { Type = InventoryType.Consensus } }).Should().Be(true); // any random object should not have priority object obj = null; diff --git a/neo/Consensus/ConsensusService.cs b/neo/Consensus/ConsensusService.cs index 2f538f2b6e..459a9e055b 100644 --- a/neo/Consensus/ConsensusService.cs +++ b/neo/Consensus/ConsensusService.cs @@ -232,7 +232,7 @@ private void OnCommitReceived(ConsensusPayload payload, Commit commit) // this function increases existing timer (never decreases) with a value proportional to `maxDelayInBlockTimes`*`Blockchain.SecondsPerBlock` private void ExtendTimerByFactor(int maxDelayInBlockTimes) { - TimeSpan nextDelay = expected_delay - (TimeProvider.Current.UtcNow - clock_started) + TimeSpan.FromMilliseconds(maxDelayInBlockTimes*Blockchain.SecondsPerBlock * 1000.0 / context.M); + TimeSpan nextDelay = expected_delay - (TimeProvider.Current.UtcNow - clock_started) + TimeSpan.FromMilliseconds(maxDelayInBlockTimes * Blockchain.SecondsPerBlock * 1000.0 / context.M); if (!context.WatchOnly && !context.ViewChanging && !context.CommitSent && (nextDelay > TimeSpan.Zero)) ChangeTimer(nextDelay); } @@ -263,7 +263,7 @@ private void OnConsensusPayload(ConsensusPayload payload) { return; } - context.LastSeenMessage[payload.ValidatorIndex] = (int) payload.BlockIndex; + context.LastSeenMessage[payload.ValidatorIndex] = (int)payload.BlockIndex; foreach (IP2PPlugin plugin in Plugin.P2PPlugins) if (!plugin.OnConsensusMessage(payload)) return; diff --git a/neo/Consensus/RecoveryRequest.cs b/neo/Consensus/RecoveryRequest.cs index 3152264894..971b49a324 100644 --- a/neo/Consensus/RecoveryRequest.cs +++ b/neo/Consensus/RecoveryRequest.cs @@ -13,7 +13,7 @@ public class RecoveryRequest : ConsensusMessage public override int Size => base.Size + sizeof(uint); //Timestamp - + public RecoveryRequest() : base(ConsensusMessageType.RecoveryRequest) { } public override void Deserialize(BinaryReader reader) diff --git a/neo/UIntBase.cs b/neo/UIntBase.cs index 4ab43c83f9..3808001022 100644 --- a/neo/UIntBase.cs +++ b/neo/UIntBase.cs @@ -5,7 +5,7 @@ namespace Neo { - + /// /// Base class for little-endian unsigned integers. Two classes inherit from this: UInt160 and UInt256. /// Only basic comparison/serialization are proposed for these classes. For arithmetic purposes, use BigInteger class.