Merge pull request #1966 from pmconrad/1965_fix_GRAPHENE_EGENESIS_JSON

Fix #1965
bitshares · Sep 2, 2019 · ff65d06 · ff65d06
2 parents 9942f79 + 6005987
commit ff65d06
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -114,10 +114,8 @@ endif()
 add_definitions (-fPIC)
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
-set(GRAPHENE_EGENESIS_JSON "${CMAKE_CURRENT_SOURCE_DIR}/libraries/egenesis/genesis.json" )
-
-#set (ENABLE_INSTALLER 1)
-#set (USE_PCH 1)
+set( GRAPHENE_EGENESIS_JSON "${CMAKE_CURRENT_SOURCE_DIR}/libraries/egenesis/genesis.json"
+     CACHE STRING "Path to embedded genesis file" )
 
 if (USE_PCH)
   include (cotire)

diff --git a/programs/cli_wallet/main.cpp b/programs/cli_wallet/main.cpp
@@ -182,17 +182,6 @@ int main( int argc, char** argv )
       setup_logging(options.at("logs-rpc-console-level").as<string>(),options.at("logs-rpc-file").as<bool>(),
             options.at("logs-rpc-file-level").as<string>(), options.at("logs-rpc-file-name").as<string>());
 
-      // key generation
-      fc::ecc::private_key committee_private_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("null_key")));
-
-      idump( (key_to_wif( committee_private_key ) ) );
-
-      fc::ecc::private_key nathan_private_key = fc::ecc::private_key::regenerate(fc::sha256::hash(string("nathan")));
-      public_key_type nathan_pub_key = nathan_private_key.get_public_key();
-      idump( (nathan_pub_key) );
-      idump( (key_to_wif( nathan_private_key ) ) );
-
-      //
       // TODO:  We read wallet_data twice, once in main() to grab the
       //    socket info, again in wallet_api when we do
       //    load_wallet_file().  Seems like this could be better