Merge branch 'split_username' into master+split_username

Author: luke-jr

CMakeLists.txt

@@ -18,8 +18,10 @@ add_executable(datum_gateway
 	src/datum_sockets.c
 	src/datum_stratum.c
 	src/datum_stratum_dupes.c
+	src/datum_stratum_tests.c
 	src/datum_submitblock.c
 	src/datum_utils.c
+	src/datum_utils_tests.c
 	src/thirdparty_base58.c
 	src/thirdparty_segwit_addr.c
 	${CMAKE_CURRENT_BINARY_DIR}/web_resources.h

src/datum_api.c

@@ -1297,6 +1297,15 @@ bool datum_api_config_set(const char * const key, const char * const val, struct
 		datum_config.stratum_v1_fingerprint_miners = val_bool;
 		datum_api_json_modify_new("stratum", "fingerprint_miners", json_boolean(val_bool));
 		// TODO: apply change to connected miners?
+	} else if (0 == strcmp(key, "stratum_split_username")) {
+		bool val_bool;
+		if (!datum_str_to_bool_strict(val, &val_bool)) {
+			json_array_append_new(errors, json_string_nocheck("\"Parse usernames to divide share submissions across multiple DATUM users\" must be 0 or 1"));
+			return false;
+		}
+		if (val_bool == datum_config.stratum_v1_split_username) return true;
+		datum_config.stratum_v1_split_username = val_bool;
+		datum_api_json_modify_new("stratum", "stratum_split_username", json_boolean(val_bool));
 	} else if (0 == strcmp(key, "datum_always_pay_self")) {
 		bool val_bool;
 		if (!datum_str_to_bool_strict(val, &val_bool)) {

src/datum_conf.c

@@ -100,6 +100,8 @@ const T_DATUM_CONFIG_ITEM datum_config_options[] = {
 		.required = false, .ptr = &datum_config.stratum_v1_idle_timeout_no_share, 	.default_int = 7200 },
 	{ .var_type = DATUM_CONF_INT, 		.category = "stratum", 		.name = "idle_timeout_max_last_work",	.description = "Seconds we allow a subscribed connection to be idle since its last accepted share? (0 disables)",
 		.required = false, .ptr = &datum_config.stratum_v1_idle_timeout_max_last_work, 	.default_int = 0 },
+	{ .var_type = DATUM_CONF_BOOL,		.category = "stratum",		.name = "split_username",			.description = "Parse usernames to divide share submissions across multiple DATUM users",
+		.required = false, .ptr = &datum_config.stratum_v1_split_username,				.default_bool = true },
 
 	// mining settings
 	{ .var_type = DATUM_CONF_STRING, 	.category = "mining", 		.name = "pool_address",				.description = "Bitcoin address used for mining rewards.",

src/datum_conf.h

@@ -101,6 +101,7 @@ typedef struct {
 	int stratum_v1_idle_timeout_no_subscribe;
 	int stratum_v1_idle_timeout_no_share;
 	int stratum_v1_idle_timeout_max_last_work;
+	bool stratum_v1_split_username;
 
 	char mining_pool_address[256];
 	char mining_coinbase_tag_primary[64];

src/datum_gateway.c

@@ -71,6 +71,7 @@ static char args_doc[] = "";
 static struct argp_option options[] = {
 	{"help", '?', 0, 0, "Show custom help", 0},
 	{"example-conf", 0x100, NULL, 0, "Print an example configuration JSON file", 0},
+	{"test", 0x101, NULL, 0, "Run tests only", 0},
 	{"usage", '?', 0, 0, "Show custom help", 0},
 	{"config", 'c', "FILE", 0, "Configuration JSON file"},
 	{0}
@@ -80,6 +81,9 @@ struct arguments {
 	char *config_file;
 };
 
+void datum_stratum_tests(void);
+void datum_utils_tests(void);
+
 static error_t parse_opt(int key, char *arg, struct argp_state *state) {
 	struct arguments *arguments = state->input;
 	switch (key) {
@@ -97,6 +101,13 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
 			datum_gateway_example_conf();
 			exit(0);
 			break;
+		case 0x101:  // test
+#ifdef NDEBUG
+			fprintf(stderr, "WARNING: Compiled with NDEBUG; tests might not actually run!\n");
+#endif
+			datum_utils_tests();
+			datum_stratum_tests();
+			exit(0);
 		default:
 			return ARGP_ERR_UNKNOWN;
 	}