fixes #11

quetzalcoatl · Jun 10, 2020 · fdd1741 · fdd1741
3 parents f092906 + baf8400 + 233980e
commit fdd1741
Show file tree

Hide file tree

Showing 48 changed files with 2,142 additions and 800 deletions.
diff --git a/.version b/.version
@@ -1,6 +1,6 @@
 {
-    "release" : "2.300003",
+    "release" : "2.300004",
     "major" : 2,
-    "minor" : 300003,
-    "revision" : 2
+    "minor" : 300004,
+    "revision" : 0
 }
diff --git a/blagominer-tests/blagominer-tests.vcxproj b/blagominer-tests/blagominer-tests.vcxproj
@@ -21,9 +21,9 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{7d18edee-1e08-4410-afbe-3f8b7509e765}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/blagominer-tests/config.tests.cpp b/blagominer-tests/config.tests.cpp
@@ -2,6 +2,7 @@
 #include <gmock/gmock.h>
 
 #include "blagominer.h"
+#include "network.h"
 
 TEST(LoadConfig, Basic_POC2StartBlock) {
 	Document document;

diff --git a/blagominer-tests/gensig.diskcoin.que.cpp b/blagominer-tests/gensig.diskcoin.que.cpp
@@ -1,6 +1,8 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
+#include "stdafx.h"
+
 #include "reference/burst/BurstMath.h"
 #include "reference/diskcoin/DiskcoinMath.h"
 #include "hexstring.h"

diff --git a/blagominer-tests/inout.tests.cpp b/blagominer-tests/inout.tests.cpp
@@ -4,11 +4,11 @@
 #include "inout.h"
 
 TEST(InOutTest_Vector, BuildAFilledString) {
-	auto output = make_filled_string(10, L'+');
+	auto output = IUserInterface::make_filled_string(10, L'+');
 	EXPECT_THAT(output, L"++++++++++");
 }
 
 TEST(InOutTest_Vector, NoCrashWhenNegative) {
-	auto output = make_filled_string(-10, L'+');
+	auto output = IUserInterface::make_filled_string(-10, L'+');
 	EXPECT_THAT(output, L"");
 }
diff --git a/blagominer/InstructionSet.h b/blagominer/InstructionSet.h
@@ -190,4 +190,3 @@ class InstructionSet
 
 
 };
-
diff --git a/blagominer/accounts.cpp b/blagominer/accounts.cpp
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "accounts.h"
-#include "common.h"
 
 size_t Get_index_acc(unsigned long long const key, std::shared_ptr<t_coin_info> coin, unsigned long long const targetDeadlineInfo)
 {
@@ -18,4 +17,4 @@ size_t Get_index_acc(unsigned long long const key, std::shared_ptr<t_coin_info>
 	coin->mining->bests.push_back({ key, ULLONG_MAX, 0, 0, targetDeadlineInfo });
 	LeaveCriticalSection(&coin->locks->bestsLock);
 	return coin->mining->bests.size() - 1;
-}
+}
diff --git a/blagominer/accounts.h b/blagominer/accounts.h
@@ -1,4 +1,6 @@
 #pragma once
-#include "blagominer.h"
+#include "common-pragmas.h"
 
-size_t Get_index_acc(unsigned long long const key, std::shared_ptr<t_coin_info> coin, unsigned long long const targetDeadlineInfo);
+#include "common.h"
+
+size_t Get_index_acc(unsigned long long const key, std::shared_ptr<t_coin_info> coin, unsigned long long const targetDeadlineInfo);
diff --git a/blagominer/bfs.cpp b/blagominer/bfs.cpp
@@ -33,4 +33,4 @@ bool LoadBFSTOC(std::string drive) {
 		return false;	}
 	//success
 	return true;
-}
+}
diff --git a/blagominer/bfs.h b/blagominer/bfs.h
@@ -1,6 +1,8 @@
 #pragma once
 #include "common-pragmas.h"
 
+#include <string>
+
 #pragma pack(1)
 struct BFSPlotFile
 {