Move enter_initial_password out of node.background (#1081)

nanocurrency · Aug 22, 2018 · 47bf8c1 · 47bf8c1
1 parent 6756f72
commit 47bf8c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/rai/node/cli.cpp b/rai/node/cli.cpp
@@ -406,7 +406,6 @@ std::error_code rai::handle_node_options (boost::program_options::variables_map
 		rai::keypair key;
 		std::cout << key.pub.to_string () << std::endl;
 		auto wallet (node.node->wallets.create (key.pub));
-		wallet->enter_initial_password ();
 	}
 	else if (vm.count ("wallet_decrypt_unsafe"))
 	{

diff --git a/rai/node/wallet.cpp b/rai/node/wallet.cpp
@@ -1302,9 +1302,6 @@ thread ([this]() { do_wallet_actions (); })
 			auto wallet (std::make_shared<rai::wallet> (error, transaction, node_a, text));
 			if (!error)
 			{
-				node_a.background ([wallet]() {
-					wallet->enter_initial_password ();
-				});
 				items[id] = wallet;
 			}
 			else
@@ -1313,6 +1310,10 @@ thread ([this]() { do_wallet_actions (); })
 			}
 		}
 	}
+	for (auto i (items.begin ()), n (items.end ()); i != n; ++i)
+	{
+		i->second->enter_initial_password ();
+	}
 }
 
 rai::wallets::~wallets ()
@@ -1343,9 +1344,7 @@ std::shared_ptr<rai::wallet> rai::wallets::create (rai::uint256_union const & id
 	if (!error)
 	{
 		items[id_a] = result;
-		node.background ([result]() {
-			result->enter_initial_password ();
-		});
+		result->enter_initial_password ();
 	}
 	return result;
 }