refactoring tests and namspaces

Rafty.sln

@@ -35,7 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		version.ps1 = version.ps1
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rafty.IntegrationTests", "test\Rafty.IntegrationTests\Rafty.IntegrationTests.csproj", "{BBB04228-BC0E-4711-9C80-769C5FAD777A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Rafty.IntegrationTests", "test\Rafty.IntegrationTests\Rafty.IntegrationTests.csproj", "{BBB04228-BC0E-4711-9C80-769C5FAD777A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/Rafty/Concensus/Messages/AppendEntries.cs

@@ -1,7 +1,8 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
     using System;
     using System.Collections.Generic;
+    using Infrastructure;
     using Log;
 
     public sealed class AppendEntries : Message

src/Rafty/Concensus/Messages/AppendEntriesBuilder.cs

@@ -1,6 +1,5 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
-    using System;
     using System.Collections.Generic;
     using Log;
 

src/Rafty/Concensus/Messages/AppendEntriesResponse.cs

@@ -1,4 +1,4 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
     public sealed class AppendEntriesResponse
     {

src/Rafty/Concensus/Messages/AppendEntriesResponseBuilder.cs

@@ -1,4 +1,4 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
     public class AppendEntriesResponseBuilder
     {

src/Rafty/Concensus/Messages/RequestVote.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
     public sealed class RequestVote
     {

src/Rafty/Concensus/Messages/RequestVoteBuilder.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
     public class RequestVoteBuilder
     {

src/Rafty/Concensus/Messages/RequestVoteResponse.cs

@@ -1,4 +1,4 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
     public sealed class RequestVoteResponse
     {

src/Rafty/Concensus/Messages/RequestVoteResponseBuilder.cs

@@ -1,4 +1,4 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Messages
 {
     public class RequestVoteResponseBuilder
     {

src/Rafty/Concensus/Node/INode.cs

@@ -1,9 +1,10 @@
-using System;
-using Rafty.FiniteStateMachine;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Node
 {
     using System.Threading.Tasks;
+    using FiniteStateMachine;
+    using Infrastructure;
+    using Messages;
+    using States;
 
     public interface INode
     {
@@ -13,7 +14,7 @@ public interface INode
         void BecomeCandidate(CurrentState state);
         Task<AppendEntriesResponse> Handle(AppendEntries appendEntries);
         Task<RequestVoteResponse> Handle(RequestVote requestVote);
-        void Start(string id);
+        void Start(NodeId id);
         void Stop();
         Task<Response<T>> Accept<T>(T command) where T : ICommand;
     }

src/Rafty/Concensus/Node/Node.cs

@@ -1,15 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Rafty.Concensus.States;
-using Rafty.FiniteStateMachine;
-using Rafty.Infrastructure;
-using Rafty.Log;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Node
 {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
     using System.Threading.Tasks;
+    using FiniteStateMachine;
+    using Infrastructure;
+    using Log;
+    using Messages;
     using Microsoft.Extensions.Logging;
+    using Peers;
+    using States;
 
     public class Node : INode
     { 
@@ -32,8 +33,6 @@ public Node(
         {
             _loggerFactory = loggerFactory;
             _logger = _loggerFactory.CreateLogger<Node>();
-            //dont think rules should be injected at the moment..EEK UNCLE BOB
-            _rules = new Rules();
             _fsm = fsm;
             _log = log;
             _random = new RandomDelay();
@@ -48,11 +47,13 @@ public Node(
 
         public IState State { get; private set; }
 
-        public void Start(string id)
+        public void Start(NodeId id)
         {
-            if(State?.CurrentState == null)
+            _rules = new Rules(_loggerFactory, id);
+
+            if (State?.CurrentState == null)
             {
-                BecomeFollower(new CurrentState(id, 0, default(string), 0, 0, default(string)));
+                BecomeFollower(new CurrentState(id.Id, 0, default(string), 0, 0, default(string)));
             }
             else
             {

src/Rafty/Concensus/Node/NodePeer.cs

@@ -1,11 +1,11 @@
-using System;
-using System.Net.Http;
-using Rafty.Concensus;
-using Rafty.FiniteStateMachine;
-
-namespace Rafty.AcceptanceTests
+namespace Rafty.Concensus.Node
 {
+    using System;
     using System.Threading.Tasks;
+    using FiniteStateMachine;
+    using Infrastructure;
+    using Messages;
+    using Peers;
 
     public class NodePeer : IPeer
     {

src/Rafty/Concensus/Peers/IPeer.cs

@@ -1,9 +1,9 @@
-using System;
-using Rafty.FiniteStateMachine;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Peers
 {
     using System.Threading.Tasks;
+    using FiniteStateMachine;
+    using Infrastructure;
+    using Messages;
 
     public interface IPeer
     {

src/Rafty/Concensus/Peers/Peer.cs

@@ -1,9 +1,10 @@
-using Rafty.FiniteStateMachine;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.Peers
 {
     using System;
     using System.Threading.Tasks;
+    using FiniteStateMachine;
+    using Infrastructure;
+    using Messages;
 
     public class Peer : IPeer
     {

src/Rafty/Concensus/States/Candidate.cs

@@ -1,17 +1,18 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using Rafty.Concensus.States;
-using Rafty.FiniteStateMachine;
-using Rafty.Log;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.States
 {
+    using System;
+    using System.Collections.Concurrent;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using FiniteStateMachine;
+    using Infrastructure;
+    using Log;
+    using Messages;
     using Microsoft.Extensions.Logging;
+    using Node;
+    using Peers;
 
     public sealed class Candidate : IState
     {
@@ -106,7 +107,7 @@ public async Task<AppendEntriesResponse> Handle(AppendEntries appendEntries)
                 return response.appendEntriesResponse;
             }
 
-            await _rules.DeleteAnyConflictsInLog(appendEntries, _log, _logger, CurrentState.Id);
+            await _rules.DeleteAnyConflictsInLog(appendEntries, _log);
 
             if (_applied > 1 && appendEntries.Entries.Any())
             {
@@ -117,7 +118,7 @@ public async Task<AppendEntriesResponse> Handle(AppendEntries appendEntries)
 
             _logger.LogInformation($"{CurrentState.Id} as {nameof(Candidate)} applying entry to log");
 
-            await _rules.ApplyNewEntriesToLog(appendEntries, _log, _logger, CurrentState.Id);
+            await _rules.ApplyNewEntriesToLog(appendEntries, _log);
 
             var commitIndexAndLastApplied = await _rules.CommitIndexAndLastApplied(appendEntries, _log, CurrentState);
 

src/Rafty/Concensus/States/CurrentState.cs

@@ -1,8 +1,6 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.States
 {
     using System;
-    using System.Collections.Generic;
-    using Rafty.Log;
 
     public class CurrentState
     {

src/Rafty/Concensus/States/Follower.cs

@@ -1,17 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.VisualBasic;
-using Newtonsoft.Json;
-using Rafty.Concensus.States;
-using Rafty.FiniteStateMachine;
-using Rafty.Log;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.States
 {
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using FiniteStateMachine;
+    using Infrastructure;
+    using Log;
+    using Messages;
     using Microsoft.Extensions.Logging;
+    using Node;
+    using Peers;
 
     public sealed class Follower : IState
     {
@@ -72,13 +72,13 @@ public async Task<AppendEntriesResponse> Handle(AppendEntries appendEntries)
                 return response.appendEntriesResponse;
             }
 
-            await _rules.DeleteAnyConflictsInLog(appendEntries, _log, _logger, CurrentState.Id);
+            await _rules.DeleteAnyConflictsInLog(appendEntries, _log);
 
             var terms = appendEntries.Entries.Any() ? string.Join(",", appendEntries.Entries.Select(x => x.Term)) : string.Empty;
 
             _logger.LogInformation($"{CurrentState.Id} as {nameof(Follower)} applying {appendEntries.Entries.Count} to log, term {terms}");
 
-            await _rules.ApplyNewEntriesToLog(appendEntries, _log, _logger, CurrentState.Id);
+            await _rules.ApplyNewEntriesToLog(appendEntries, _log);
 
             var commitIndexAndLastApplied = await _rules.CommitIndexAndLastApplied(appendEntries, _log, CurrentState);
 

src/Rafty/Concensus/States/IState.cs

@@ -1,8 +1,9 @@
-using Rafty.FiniteStateMachine;
-
-namespace Rafty.Concensus
+namespace Rafty.Concensus.States
 {
     using System.Threading.Tasks;
+    using FiniteStateMachine;
+    using Infrastructure;
+    using Messages;
 
     public interface IState
     {

src/Rafty/Concensus/States/Leader.cs

@@ -1,34 +1,34 @@
-namespace Rafty.Concensus
-{  
+namespace Rafty.Concensus.States
+{
+    using System;
     using System.Collections.Concurrent;
+    using System.Collections.Generic;
+    using System.Diagnostics;
     using System.Linq;
     using System.Threading;
-    using System;
-    using System.Collections.Generic;
     using System.Threading.Tasks;
-    using Newtonsoft.Json;
-    using Rafty.Concensus.States;
-    using Rafty.FiniteStateMachine;
-    using Rafty.Log;
-    using System.Diagnostics;
+    using FiniteStateMachine;
+    using Infrastructure;
+    using Log;
+    using Messages;
     using Microsoft.Extensions.Logging;
+    using Node;
+    using Peers;
 
     public sealed class Leader : IState
     {
         private readonly IFiniteStateMachine _fsm;
-        Func<CurrentState, List<IPeer>> _getPeers;
+        readonly Func<CurrentState, List<IPeer>> _getPeers;
         private readonly ILog _log;
         private readonly INode _node;
         private readonly ISettings _settings;
         private IRules _rules;
-        private readonly object _lock = new object();
         private bool _handled;
         private Stopwatch _stopWatch;
         private Timer _electionTimer;
         public long SendAppendEntriesCount;
         private bool _appendingEntries;
-        private ILogger<Leader> _logger;
-        private SemaphoreSlim _semaphore = new SemaphoreSlim(1,1);
+        private readonly ILogger<Leader> _logger;
 
         public Leader(
             CurrentState currentState, 

src/Rafty/Concensus/States/MatchIndex.cs

@@ -1,5 +1,7 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.States
 {
+    using Peers;
+
     public class MatchIndex
     {
         public MatchIndex(IPeer peer, int indexOfHighestKnownReplicatedLog)

src/Rafty/Concensus/States/NextIndex.cs

@@ -1,5 +1,7 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.States
 {
+    using Peers;
+
     public class NextIndex
     {
         public NextIndex(IPeer peer, int nextLogIndexToSendToPeer)

src/Rafty/Concensus/States/PeerState.cs

@@ -1,5 +1,7 @@
-namespace Rafty.Concensus
+namespace Rafty.Concensus.States
 {
+    using Peers;
+
     public class PeerState
     {
         public PeerState(IPeer peer, MatchIndex matchIndex, NextIndex nextIndex)