From 18bf848119531dd667608013d3dbfa3748ee63b0 Mon Sep 17 00:00:00 2001 From: hirunda Date: Wed, 9 Feb 2022 17:48:36 +0100 Subject: [PATCH] Enable multiple SON support by default --- libraries/plugins/peerplays_sidechain/CMakeLists.txt | 8 -------- .../peerplays_sidechain/peerplays_sidechain_plugin.cpp | 6 ------ 2 files changed, 14 deletions(-) diff --git a/libraries/plugins/peerplays_sidechain/CMakeLists.txt b/libraries/plugins/peerplays_sidechain/CMakeLists.txt index bb74df29..66795016 100755 --- a/libraries/plugins/peerplays_sidechain/CMakeLists.txt +++ b/libraries/plugins/peerplays_sidechain/CMakeLists.txt @@ -23,19 +23,11 @@ add_library( peerplays_sidechain ) if (ENABLE_DEV_FEATURES) - set(ENABLE_MULTIPLE_SONS 1) set(ENABLE_PEERPLAYS_ASSET_DEPOSITS 1) endif() unset(ENABLE_DEV_FEATURES) unset(ENABLE_DEV_FEATURES CACHE) -if (ENABLE_MULTIPLE_SONS) - message ("Multiple SONs per software instance are supported") - target_compile_definitions(peerplays_sidechain PRIVATE ENABLE_MULTIPLE_SONS) -endif() -unset(ENABLE_MULTIPLE_SONS) -unset(ENABLE_MULTIPLE_SONS CACHE) - if (ENABLE_PEERPLAYS_ASSET_DEPOSITS) message ("Depositing Peerplays assets enabled") target_compile_definitions(peerplays_sidechain PRIVATE ENABLE_PEERPLAYS_ASSET_DEPOSITS) diff --git a/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp b/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp index 67a1783f..26976676 100644 --- a/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp +++ b/libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp @@ -176,12 +176,6 @@ void peerplays_sidechain_plugin_impl::plugin_initialize(const boost::program_opt } config_ready_son = config_ready_son && !sons.empty(); -#ifndef ENABLE_MULTIPLE_SONS - if (sons.size() > 1) { - FC_THROW("Invalid configuration, multiple SON IDs provided"); - } -#endif - if (options.count("peerplays-private-key")) { const std::vector key_id_to_wif_pair_strings = options["peerplays-private-key"].as>(); for (const std::string &key_id_to_wif_pair_string : key_id_to_wif_pair_strings) {