Major updates integration from all upstreams

2018-09-18 14:33:53 -07:00
parent 0c8fa56a02 0e0f5e4ea7
commit 9feb4b9e08
396 changed files with 25517 additions and 6854 deletions
--- a/src/test-komodo/testutils.cpp
+++ b/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"