From e5e4a07441afd86be9218f9f679000e0c00d7f24 Mon Sep 17 00:00:00 2001
From: Dario <dario.rekowski@gmx.de>
Date: Mon, 9 Nov 2020 18:44:19 +0100
Subject: [PATCH] move enum HederaNetworkType into namespace (and file)
 ServerConfig to use it for a server config option

---
 .../HTTPInterface/AdminHederaAccountPage.cpp  |  8 +++---
 src/cpp/ServerConfig.cpp                      | 11 ++++++++
 src/cpp/ServerConfig.h                        |  8 ++++++
 src/cpp/controller/HederaAccount.cpp          |  6 ++--
 src/cpp/controller/HederaAccount.h            |  4 +--
 src/cpp/controller/HederaId.cpp               |  2 +-
 src/cpp/controller/HederaId.h                 |  2 +-
 src/cpp/controller/NodeServer.cpp             |  6 ++--
 src/cpp/controller/NodeServer.h               |  2 +-
 src/cpp/model/gradido/Transaction.cpp         |  8 +++---
 src/cpp/model/table/HederaAccount.cpp         | 28 +++++++++++++------
 src/cpp/model/table/HederaAccount.h           | 18 ++++++------
 src/cpp/tasks/SigningTransaction.cpp          |  2 +-
 src/cpsp/adminHederaAccount.cpsp              |  8 +++---
 src/cpsp/adminTopic.cpsp                      |  4 ++-
 15 files changed, 74 insertions(+), 43 deletions(-)

diff --git a/src/cpp/HTTPInterface/AdminHederaAccountPage.cpp b/src/cpp/HTTPInterface/AdminHederaAccountPage.cpp
index 28c99c26a..19168f572 100644
--- a/src/cpp/HTTPInterface/AdminHederaAccountPage.cpp
+++ b/src/cpp/HTTPInterface/AdminHederaAccountPage.cpp
@@ -188,7 +188,7 @@ void AdminHederaAccountPage::handleRequest(Poco::Net::HTTPServerRequest& request
 				if(DataTypeConverter::strToInt(networkTypeString, networkType) != DataTypeConverter::NUMBER_PARSE_OKAY) {
 					addError(new Error("Int Convert Error", "Error converting network type to int"));
 				}
-				if(networkType < 0 || networkType >= (int)model::table::HEDERA_NET_COUNT) {
+				if(networkType < 0 || networkType >= (int)ServerConfig::HEDERA_NET_COUNT) {
 					addError(new Error("Network Type", "invalid value"));
 				}
 			}
@@ -228,7 +228,7 @@ void AdminHederaAccountPage::handleRequest(Poco::Net::HTTPServerRequest& request
 							hedera_id->getModel()->getID(),
 							crypto_key->getModel()->getID(),
 							0,
-							(model::table::HederaNetworkType)networkType
+							(ServerConfig::HederaNetworkType)networkType
 						);
 						if(!hedera_account->getModel()->insertIntoDB(false)) {
 							addError(new Error("DB Error", "Error saving hedera account into DB"));
@@ -414,13 +414,13 @@ void AdminHederaAccountPage::handleRequest(Poco::Net::HTTPServerRequest& request
 	responseStream << "\t\t\t<select class=\"form-control\" name=\"account-network-type\" id=\"account-network-type\">\n";
 	responseStream << "\t\t\t";
 #line 301 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminHederaAccount.cpsp"
- for(int i = 0; i < model::table::HEDERA_NET_COUNT; i++) { 	responseStream << "\n";
+ for(int i = 0; i < ServerConfig::HEDERA_NET_COUNT; i++) { 	responseStream << "\n";
 	responseStream << "\t\t\t\t<option value=\"";
 #line 302 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminHederaAccount.cpsp"
 	responseStream << ( i );
 	responseStream << "\">";
 #line 302 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminHederaAccount.cpsp"
-	responseStream << ( model::table::HederaAccount::hederaNetworkTypeToString((model::table::HederaNetworkType)i) );
+	responseStream << ( model::table::HederaAccount::hederaNetworkTypeToString((ServerConfig::HederaNetworkType)i) );
 	responseStream << "</option>\n";
 	responseStream << "\t\t\t";
 #line 303 "F:\\Gradido\\gradido_login_server\\src\\cpsp\\adminHederaAccount.cpsp"
diff --git a/src/cpp/ServerConfig.cpp b/src/cpp/ServerConfig.cpp
index 727c55e1c..ad90fcbd0 100644
--- a/src/cpp/ServerConfig.cpp
+++ b/src/cpp/ServerConfig.cpp
@@ -20,6 +20,8 @@
 #include "Poco/DateTimeFormat.h"
 #include "Poco/DateTimeFormatter.h"
 
+#include "model/table/HederaAccount.h"
+
 
 using Poco::Net::SSLManager;
 using Poco::Net::Context;
@@ -57,6 +59,7 @@ namespace ServerConfig {
 	std::string g_gRPCRelayServerFullURL;
 	MemoryBin*  g_CryptoAppSecret = nullptr;
 	HederaConsensusMessageFormat g_ConsensusMessageFormat = HEDERA_CONSENSUS_FORMAT_BINARY;
+	HederaNetworkType g_HederaNetworkType = HEDERA_TESTNET;
 
 #ifdef __linux__ 
 #include <stdio.h>      
@@ -163,6 +166,8 @@ namespace ServerConfig {
 		return HEDERA_CONSENSUS_FORMAT_BINARY;
 	}
 
+	
+
 
 	bool loadMnemonicWordLists()
 	{
@@ -242,6 +247,12 @@ namespace ServerConfig {
 		auto hedera_consensus_message_format_string = cfg.getString("hedera.consensus.message_format", "bin");
 		g_ConsensusMessageFormat = getHederaConsensusMessageFormatFromString(hedera_consensus_message_format_string);
 
+		auto hedera_network_type_string = cfg.getString("hedera.nettype", "Testnet");
+		g_HederaNetworkType = model::table::HederaAccount::hederaNetworkTypeFromString(hedera_network_type_string);
+		if (HEDERA_UNKNOWN == g_HederaNetworkType) {
+			g_HederaNetworkType = HEDERA_TESTNET;
+		}
+
 		// app secret for encrypt user private keys
 		// TODO: encrypt with server admin key
 		auto app_secret_string = cfg.getString("crypto.app_secret", "");
diff --git a/src/cpp/ServerConfig.h b/src/cpp/ServerConfig.h
index 21c5c58e4..4a0cbec7d 100644
--- a/src/cpp/ServerConfig.h
+++ b/src/cpp/ServerConfig.h
@@ -54,6 +54,13 @@ namespace ServerConfig {
 		HEDERA_CONSENSUS_FORMAT_BASE64_URLSAVE_NO_PADDING
 	};
 
+	enum HederaNetworkType {
+		HEDERA_MAINNET,
+		HEDERA_TESTNET,
+		HEDERA_NET_COUNT,
+		HEDERA_UNKNOWN
+	};
+
 
 	extern Mnemonic g_Mnemonic_WordLists[MNEMONIC_MAX];
 
@@ -82,6 +89,7 @@ namespace ServerConfig {
 	extern MemoryBin*  g_CryptoAppSecret;
 	extern AllowUnsecure g_AllowUnsecureFlags;
 	extern HederaConsensusMessageFormat g_ConsensusMessageFormat;
+	extern HederaNetworkType g_HederaNetworkType;
 
 	bool loadMnemonicWordLists();
 	bool initServerCrypto(const Poco::Util::LayeredConfiguration& cfg);
diff --git a/src/cpp/controller/HederaAccount.cpp b/src/cpp/controller/HederaAccount.cpp
index e0a31b40e..24d77de12 100644
--- a/src/cpp/controller/HederaAccount.cpp
+++ b/src/cpp/controller/HederaAccount.cpp
@@ -21,7 +21,7 @@ namespace controller {
 	{
 	}
 
-	Poco::AutoPtr<HederaAccount> HederaAccount::create(int user_id, int account_hedera_id, int account_key_id, Poco::UInt64 balance/* = 0*/, model::table::HederaNetworkType type/* = HEDERA_MAINNET*/)
+	Poco::AutoPtr<HederaAccount> HederaAccount::create(int user_id, int account_hedera_id, int account_key_id, Poco::UInt64 balance/* = 0*/, ServerConfig::HederaNetworkType type/* = HEDERA_MAINNET*/)
 	{
 		auto db = new model::table::HederaAccount(user_id, account_hedera_id, account_key_id, balance, type);
 		auto group = new HederaAccount(db);
@@ -75,7 +75,7 @@ namespace controller {
 		return nullptr;
 	}
 
-	Poco::AutoPtr<HederaAccount> HederaAccount::pick(model::table::HederaNetworkType networkType, bool encrypted/* = false*/)
+	Poco::AutoPtr<HederaAccount> HederaAccount::pick(ServerConfig::HederaNetworkType networkType, bool encrypted/* = false*/)
 	{
 		auto cm = ConnectionManager::getInstance();
 		auto session = cm->getConnection(CONNECTION_MYSQL_LOGIN_SERVER);
@@ -269,7 +269,7 @@ namespace controller {
 	{
 		std::stringstream ss;
 		auto model = getModel();
-		ss << model::table::HederaAccount::hederaNetworkTypeToString((model::table::HederaNetworkType)model->getNetworkType()) << " ";
+		ss << model::table::HederaAccount::hederaNetworkTypeToString((ServerConfig::HederaNetworkType)model->getNetworkType()) << " ";
 		ss << getHederaId()->getModel()->toString() << " " << ((double)model->getBalance() / 100000000.0) << " Hbar";
 		return ss.str();
 	}
diff --git a/src/cpp/controller/HederaAccount.h b/src/cpp/controller/HederaAccount.h
index 94e21a597..1c6efccbe 100644
--- a/src/cpp/controller/HederaAccount.h
+++ b/src/cpp/controller/HederaAccount.h
@@ -18,14 +18,14 @@ namespace controller {
 	public:
 		~HederaAccount();
 
-		static Poco::AutoPtr<HederaAccount> create(int user_id, int account_hedera_id, int account_key_id, Poco::UInt64 balance = 0, model::table::HederaNetworkType type = model::table::HEDERA_MAINNET);
+		static Poco::AutoPtr<HederaAccount> create(int user_id, int account_hedera_id, int account_key_id, Poco::UInt64 balance = 0, ServerConfig::HederaNetworkType type = ServerConfig::HEDERA_MAINNET);
 
 		static std::vector<Poco::AutoPtr<HederaAccount>> load(const std::string& fieldName, int fieldValue);
 		static Poco::AutoPtr<HederaAccount> load(int id);
 		static Poco::AutoPtr<HederaAccount> load(Poco::AutoPtr<controller::HederaId> hederaId);
 		static std::vector<Poco::AutoPtr<HederaAccount>> listAll();
 		//! \brief for picking a account for paying transaction, mostly consensusSendMessage
-		static Poco::AutoPtr<HederaAccount> pick(model::table::HederaNetworkType networkType, bool encrypted = false);
+		static Poco::AutoPtr<HederaAccount> pick(ServerConfig::HederaNetworkType networkType, bool encrypted = false);
 
 		inline bool deleteFromDB() { return mDBModel->deleteFromDB(); }
 
diff --git a/src/cpp/controller/HederaId.cpp b/src/cpp/controller/HederaId.cpp
index 9e39cd84b..7cf33e04e 100644
--- a/src/cpp/controller/HederaId.cpp
+++ b/src/cpp/controller/HederaId.cpp
@@ -33,7 +33,7 @@ namespace controller {
 		return nullptr;
 	}
 
-	Poco::AutoPtr<HederaId> HederaId::find(int groupId, model::table::HederaNetworkType networkType)
+	Poco::AutoPtr<HederaId> HederaId::find(int groupId, ServerConfig::HederaNetworkType networkType)
 	{
 		auto cm = ConnectionManager::getInstance();
 		auto session = cm->getConnection(CONNECTION_MYSQL_LOGIN_SERVER);
diff --git a/src/cpp/controller/HederaId.h b/src/cpp/controller/HederaId.h
index 0bfc1f691..24b0a56d0 100644
--- a/src/cpp/controller/HederaId.h
+++ b/src/cpp/controller/HederaId.h
@@ -23,7 +23,7 @@ namespace controller {
 
 		static Poco::AutoPtr<HederaId> load(int id);
 		//! \return hedera topic id for group and network type (should exist only one)
-		static Poco::AutoPtr<HederaId> find(int groupId, model::table::HederaNetworkType networkType);
+		static Poco::AutoPtr<HederaId> find(int groupId, ServerConfig::HederaNetworkType networkType);
 
 		bool isExistInDB();
 
diff --git a/src/cpp/controller/NodeServer.cpp b/src/cpp/controller/NodeServer.cpp
index 5722aedd9..857520a9e 100644
--- a/src/cpp/controller/NodeServer.cpp
+++ b/src/cpp/controller/NodeServer.cpp
@@ -93,11 +93,11 @@ namespace controller {
 	ORDER BY RAND()
 	LIMIT 1;
 	*/
-	NodeServerConnection NodeServer::pick(model::table::HederaNetworkType type, int group_id /*= 0*/)
+	NodeServerConnection NodeServer::pick(ServerConfig::HederaNetworkType type, int group_id /*= 0*/)
 	{
 		model::table::NodeServerType node_server_type = model::table::NODE_SERVER_NONE;
-		if (model::table::HEDERA_MAINNET) node_server_type = model::table::NODE_SERVER_HEDERA_MAINNET_NODE;
-		else if (model::table::HEDERA_TESTNET) node_server_type = model::table::NODE_SERVER_HEDERA_TESTNET_NODE;
+		if (ServerConfig::HEDERA_MAINNET) node_server_type = model::table::NODE_SERVER_HEDERA_MAINNET_NODE;
+		else if (ServerConfig::HEDERA_TESTNET) node_server_type = model::table::NODE_SERVER_HEDERA_TESTNET_NODE;
 		return pick(node_server_type, group_id);
 	}
 	NodeServerConnection NodeServer::pick(model::table::NodeServerType type, int group_id/* = 0*/)
diff --git a/src/cpp/controller/NodeServer.h b/src/cpp/controller/NodeServer.h
index 3cab1cea2..ecd7e11e1 100644
--- a/src/cpp/controller/NodeServer.h
+++ b/src/cpp/controller/NodeServer.h
@@ -44,7 +44,7 @@ namespace controller {
 		static std::vector<Poco::AutoPtr<NodeServer>> load(model::table::NodeServerType type, int group_id = 0);		
 		static std::vector<Poco::AutoPtr<NodeServer>> listAll();
 		// pick server randomly
-		static NodeServerConnection pick(model::table::HederaNetworkType type, int group_id = 0);
+		static NodeServerConnection pick(ServerConfig::HederaNetworkType type, int group_id = 0);
 		static NodeServerConnection pick(model::table::NodeServerType type, int group_id = 0);
 		bool deleteFromDB();
 
diff --git a/src/cpp/model/gradido/Transaction.cpp b/src/cpp/model/gradido/Transaction.cpp
index 23b48f57a..1935241ed 100644
--- a/src/cpp/model/gradido/Transaction.cpp
+++ b/src/cpp/model/gradido/Transaction.cpp
@@ -54,7 +54,7 @@ namespace model {
 				return nullptr;
 			}
 			auto group_model = group->getModel();
-			auto network_type = table::HEDERA_TESTNET;
+			auto network_type = ServerConfig::g_HederaNetworkType;
 			auto topic_id = controller::HederaId::find(group_model->getID(), network_type);
 
 			if (topic_id.isNull()) {
@@ -82,7 +82,7 @@ namespace model {
 			if (receiver.isNull() || !receiver->getModel()) {
 				return nullptr;
 			}
-			auto network_type = table::HEDERA_TESTNET;
+			auto network_type = ServerConfig::g_HederaNetworkType;
 			auto receiver_model = receiver->getModel();
 			auto topic_id = controller::HederaId::find(receiver_model->getGroupId(), network_type);
 
@@ -113,7 +113,7 @@ namespace model {
 			
 			//std::vector<Poco::AutoPtr<TransactionBody>> bodys;
 			auto sender_model = sender->getModel();
-			auto network_type = table::HEDERA_TESTNET;
+			auto network_type = ServerConfig::g_HederaNetworkType;
 			// LOCAL Transfer
 			if (receiverGroup.isNull() ||  sender_model->getGroupId() == receiverGroup->getModel()->getID())
 			{	
@@ -463,7 +463,7 @@ namespace model {
 			else 
 			{
 				// send transaction via hedera
-				auto network_type = table::HEDERA_TESTNET;
+				auto network_type = ServerConfig::g_HederaNetworkType;
 				// TODO: get correct topic id for user group
 				//int user_group_id = 1;
 				//auto topic_id = controller::HederaId::find(user_group_id, network_type);
diff --git a/src/cpp/model/table/HederaAccount.cpp b/src/cpp/model/table/HederaAccount.cpp
index a911e0836..b5b84a206 100644
--- a/src/cpp/model/table/HederaAccount.cpp
+++ b/src/cpp/model/table/HederaAccount.cpp
@@ -11,7 +11,7 @@ namespace model {
 			
 		}
 
-		HederaAccount::HederaAccount(int user_id, int account_hedera_id, int account_key_id, Poco::UInt64 balance/* = 0*/, HederaNetworkType type /*= HEDERA_MAINNET*/)
+		HederaAccount::HederaAccount(int user_id, int account_hedera_id, int account_key_id, Poco::UInt64 balance/* = 0*/, ServerConfig::HederaNetworkType type /*= ServerConfig::HEDERA_MAINNET*/)
 			: mUserId(user_id), mAccountHederaId(account_hedera_id), mAccountKeyId(account_key_id), mBalance(balance), mType(type)
 		{
 			
@@ -38,7 +38,7 @@ namespace model {
 			ss << "account crypto key id: " << std::to_string(mAccountKeyId) << std::endl;
 			// balance in tinybars, 100,000,000 tinybar = 1 HashBar
 			ss << "account balance: " << std::to_string((double)(mBalance) * 100000000.0) << " HBAR" << std::endl;
-			ss << "Hedera Net Type: " << hederaNetworkTypeToString((HederaNetworkType)mType) << std::endl;
+			ss << "Hedera Net Type: " << hederaNetworkTypeToString((ServerConfig::HederaNetworkType)mType) << std::endl;
 			ss << "last update: " << Poco::DateTimeFormatter::format(mUpdated, "%f.%m.%Y %H:%M:%S") << std::endl;
 
 			return ss.str();
@@ -57,20 +57,32 @@ namespace model {
 		}
 
 
-		const char* HederaAccount::hederaNetworkTypeToString(HederaNetworkType type)
+		const char* HederaAccount::hederaNetworkTypeToString(ServerConfig::HederaNetworkType type)
 		{
 			switch (type) {
-			case HEDERA_MAINNET: return "Mainnet";
-			case HEDERA_TESTNET: return "Testnet";
+			case ServerConfig::HEDERA_MAINNET: return "Mainnet";
+			case ServerConfig::HEDERA_TESTNET: return "Testnet";
+			case ServerConfig::HEDERA_UNKNOWN: return "unknown";
 			default: return "<unknown>";
 			}
 		}
 
-		NodeServerType HederaAccount::networkTypeToNodeServerType(HederaNetworkType type)
+		ServerConfig::HederaNetworkType HederaAccount::hederaNetworkTypeFromString(const std::string& typeString)
+		{
+			if ("MAINNET" == typeString || "Mainnet" == typeString) {
+				return ServerConfig::HEDERA_MAINNET;
+			}
+			if ("TESTNET" == typeString || "Testnet" == typeString) {
+				return ServerConfig::HEDERA_TESTNET;
+			}
+			return ServerConfig::HEDERA_UNKNOWN;
+		}
+
+		NodeServerType HederaAccount::networkTypeToNodeServerType(ServerConfig::HederaNetworkType type)
 		{
 			switch (type) {
-			case HEDERA_MAINNET: return NODE_SERVER_HEDERA_MAINNET_NODE;
-			case HEDERA_TESTNET: return NODE_SERVER_HEDERA_TESTNET_NODE;
+			case ServerConfig::HEDERA_MAINNET: return NODE_SERVER_HEDERA_MAINNET_NODE;
+			case ServerConfig::HEDERA_TESTNET: return NODE_SERVER_HEDERA_TESTNET_NODE;
 			default: return NODE_SERVER_TYPE_NONE;
 			}
 		}
diff --git a/src/cpp/model/table/HederaAccount.h b/src/cpp/model/table/HederaAccount.h
index aa1a6489f..c3557afbe 100644
--- a/src/cpp/model/table/HederaAccount.h
+++ b/src/cpp/model/table/HederaAccount.h
@@ -1,7 +1,8 @@
 #ifndef GRADIDO_LOGIN_SERVER_MODEL_TABLE_HEDERA_ACCOUNTS_INCLUDE
 #define GRADIDO_LOGIN_SERVER_MODEL_TABLE_HEDERA_ACCOUNTS_INCLUDE
 
-#include "ModelBase.h"
+//#include "ModelBase.h"
+#include "../../ServerConfig.h"
 #include "Poco/Tuple.h"
 
 #include "NodeServer.h"
@@ -11,17 +12,13 @@ namespace model {
 
 		typedef Poco::Tuple<int, int, int, int, Poco::UInt64, int, Poco::DateTime> HederaAccountTuple;
 
-		enum HederaNetworkType {
-			HEDERA_MAINNET,
-			HEDERA_TESTNET,
-			HEDERA_NET_COUNT,
-		};
+		
 
 		class HederaAccount : public ModelBase
 		{
 		public:
 			HederaAccount();
-			HederaAccount(int user_id, int account_hedera_id, int account_key_id, Poco::UInt64 balance = 0, HederaNetworkType type = HEDERA_MAINNET);
+			HederaAccount(int user_id, int account_hedera_id, int account_key_id, Poco::UInt64 balance = 0, ServerConfig::HederaNetworkType type = ServerConfig::HEDERA_MAINNET);
 			HederaAccount(const HederaAccountTuple& tuple);
 			~HederaAccount();
 
@@ -30,8 +27,9 @@ namespace model {
 			std::string toString();
 			
 
-			static const char* hederaNetworkTypeToString(HederaNetworkType type);
-			static NodeServerType networkTypeToNodeServerType(HederaNetworkType type);
+			static const char* hederaNetworkTypeToString(ServerConfig::HederaNetworkType type);
+			static NodeServerType networkTypeToNodeServerType(ServerConfig::HederaNetworkType type);
+			static ServerConfig::HederaNetworkType hederaNetworkTypeFromString(const std::string& typeString);
 
 			inline int getAccountHederaId() const { return mAccountHederaId; }
 			inline int getCryptoKeyId() const { return mAccountKeyId; }
@@ -41,7 +39,7 @@ namespace model {
 			inline double getBalanceDouble() { return (double)mBalance / 100000000.0; }
 			std::string getBalanceString();
 
-			inline HederaNetworkType getNetworkType() { return (HederaNetworkType)mType; }
+			inline ServerConfig::HederaNetworkType getNetworkType() { return (ServerConfig::HederaNetworkType)mType; }
 			
 
 			inline std::string getUpdatedString() { return Poco::DateTimeFormatter::format(mUpdated, "%f.%m.%Y %H:%M:%S"); }
diff --git a/src/cpp/tasks/SigningTransaction.cpp b/src/cpp/tasks/SigningTransaction.cpp
index 5ba21673a..98272f3e7 100644
--- a/src/cpp/tasks/SigningTransaction.cpp
+++ b/src/cpp/tasks/SigningTransaction.cpp
@@ -165,7 +165,7 @@ int SigningTransaction::run() {
 		return -6;
 	}
 
-	auto network_type = model::table::HEDERA_TESTNET;
+	auto network_type = ServerConfig::HEDERA_TESTNET;
 	auto topic_id = controller::HederaId::find(1, network_type);
 	auto hedera_operator_account = controller::HederaAccount::pick(network_type, false);
 	
diff --git a/src/cpsp/adminHederaAccount.cpsp b/src/cpsp/adminHederaAccount.cpsp
index 45f2c65ae..ec2d1397b 100644
--- a/src/cpsp/adminHederaAccount.cpsp
+++ b/src/cpsp/adminHederaAccount.cpsp
@@ -167,7 +167,7 @@
 				if(DataTypeConverter::strToInt(networkTypeString, networkType) != DataTypeConverter::NUMBER_PARSE_OKAY) {
 					addError(new Error("Int Convert Error", "Error converting network type to int"));
 				}
-				if(networkType < 0 || networkType >= (int)model::table::HEDERA_NET_COUNT) {
+				if(networkType < 0 || networkType >= (int)ServerConfig::HEDERA_NET_COUNT) {
 					addError(new Error("Network Type", "invalid value"));
 				}
 			}
@@ -207,7 +207,7 @@
 							hedera_id->getModel()->getID(),
 							crypto_key->getModel()->getID(),
 							0,
-							(model::table::HederaNetworkType)networkType
+							(ServerConfig::HederaNetworkType)networkType
 						);
 						if(!hedera_account->getModel()->insertIntoDB(false)) {
 							addError(new Error("DB Error", "Error saving hedera account into DB"));
@@ -298,8 +298,8 @@
 			<input class="form-control" id="account-public-key" type="text" name="account-public-key"/>
 			<label class="form-label" for="account-network-type">Network Type</label>
 			<select class="form-control" name="account-network-type" id="account-network-type">
-			<% for(int i = 0; i < model::table::HEDERA_NET_COUNT; i++) { %>
-				<option value="<%= i %>"><%= model::table::HederaAccount::hederaNetworkTypeToString((model::table::HederaNetworkType)i) %></option>
+			<% for(int i = 0; i < ServerConfig::HEDERA_NET_COUNT; i++) { %>
+				<option value="<%= i %>"><%= model::table::HederaAccount::hederaNetworkTypeToString((ServerConfig::HederaNetworkType)i) %></option>
 			<% } %>
 			</select>
 			<input class="center-form-submit form-button" type="submit" name="add" value="<%= gettext("Add Account") %>">
diff --git a/src/cpsp/adminTopic.cpsp b/src/cpsp/adminTopic.cpsp
index 32dfb68c8..62496936b 100644
--- a/src/cpsp/adminTopic.cpsp
+++ b/src/cpsp/adminTopic.cpsp
@@ -103,7 +103,9 @@
 			if(DataTypeConverter::strToInt(group_id_string, group_id) != DataTypeConverter::NUMBER_PARSE_OKAY) {
 				addError(new Error("Int convert error", "Error converting group_id to int"));
 			}
-		}	
+		}
+
+		
 	}