From 78536abf821c11f57879f89816792566be3e595f Mon Sep 17 00:00:00 2001 From: emanuel Date: Mon, 22 May 2023 16:14:46 +0100 Subject: [PATCH] Remove config'd explicit consensus VCM modes --- src/config.c | 25 ------------------------- src/vcm.c | 1 + 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/config.c b/src/config.c index c438b2d..55442e6 100644 --- a/src/config.c +++ b/src/config.c @@ -359,37 +359,12 @@ int facilities_config() { facilities.coordination.active = config->facilities.mcm.activate; if (!strcmp("vcm-RR", config->facilities.mcm.protocol)) { facilities.coordination.protocol = MC_PROTOCOL_VCM_RR; - facilities.coordination.chain.enabled = true; } else if (!strcmp("vcm-RR1C", config->facilities.mcm.protocol)) { facilities.coordination.protocol = MC_PROTOCOL_VCM_RR1C; - facilities.coordination.chain.enabled = true; - } else if (!strcmp("vcm-RR1Cc", config->facilities.mcm.protocol)) { - facilities.coordination.protocol = MC_PROTOCOL_VCM_RR1C; - facilities.coordination.chain.enabled = true; } else if (!strcmp("vcm-RRAC", config->facilities.mcm.protocol)) { facilities.coordination.protocol = MC_PROTOCOL_VCM_RRAC; - facilities.coordination.chain.enabled = true; - } else if (!strcmp("vcm-RRACc", config->facilities.mcm.protocol)) { - facilities.coordination.protocol = MC_PROTOCOL_VCM_RRAC; - facilities.coordination.chain.enabled = true; - } else if (!strcmp("evcm-RR-PBFT", config->facilities.mcm.protocol)) { - facilities.coordination.protocol = MC_PROTOCOL_VCM_RR; - facilities.coordination.chain.enabled = false; - } else if (!strcmp("evcm-RR1C-PBFT", config->facilities.mcm.protocol)) { - facilities.coordination.protocol = MC_PROTOCOL_VCM_RR1C; - facilities.coordination.chain.enabled = false; - } else if (!strcmp("evcm-RR1Cc-PBFT", config->facilities.mcm.protocol)) { - facilities.coordination.protocol = MC_PROTOCOL_VCM_RR1C; - facilities.coordination.chain.enabled = false; - } else if (!strcmp("evcm-RRAC-PBFT", config->facilities.mcm.protocol)) { - facilities.coordination.protocol = MC_PROTOCOL_VCM_RRAC; - facilities.coordination.chain.enabled = false; - } else if (!strcmp("evcm-RRACc-PBFT", config->facilities.mcm.protocol)) { - facilities.coordination.protocol = MC_PROTOCOL_VCM_RRAC; - facilities.coordination.chain.enabled = false; } else { facilities.coordination.protocol = MC_PROTOCOL_VCM_RR; - facilities.coordination.chain.enabled = true; } facilities.coordination.vcm_period_min = config->facilities.mcm.period_min; facilities.coordination.vcm_period_max = config->facilities.mcm.period_max; diff --git a/src/vcm.c b/src/vcm.c index 865dfd8..0dc246d 100644 --- a/src/vcm.c +++ b/src/vcm.c @@ -1209,4 +1209,5 @@ void coordination_init() { coordination_t* coo = &facilities.coordination; pthread_mutex_init(&coo->lock, NULL); coo->mgmt_socket = itss_0connect(facilities.zmq.management_address, ZMQ_REQ); + coo->chain.enabled = false; }