Merge branch 'FSM' of https://github.com/jl777/komodo into jl777-FSM

merge

src/test-komodo/test_eval_bet.cpp

@@ -225,7 +225,7 @@ public:
         eval.txs[sessionTx.GetHash()] = sessionTx;
 
         CBlockIndex sessionBlock;
-        sessionBlock.nHeight = 10;
+        sessionBlock.SetHeight(10);
         eval.blocks[sessionTx.GetHash()] = sessionBlock;
 
         std::vector<CTransaction> sessionSpends;

src/test-komodo/test_eval_notarisation.cpp

@@ -77,7 +77,7 @@ namespace TestEvalNotarisation {
             modify(notary);
 
             eval.txs[notary.GetHash()] = CTransaction(notary);
-            eval.blocks[notary.GetHash()].nHeight = 780060;
+            eval.blocks[notary.GetHash()].SetHeight(780060);
             eval.blocks[notary.GetHash()].nTime = 1522946781;
         }
 

src/test-komodo/testutils.cpp

@@ -8,8 +8,8 @@
 #include "miner.h"
 #include "notarisationdb.h"
 #include "random.h"
-#include "rpcserver.h"
-#include "rpcprotocol.h"
+#include "rpc/server.h"
+#include "rpc/protocol.h"
 #include "txdb.h"
 #include "util.h"
 #include "utilstrencodings.h"