Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Revert "Reorder lock/transaction (#773)" write txs

Browse source 
This reverts commit 440f0ec90c.
This commit is contained in:
Lee Bousfield 2018-04-03 05:55:59 -06:00
commit e1e118f9be
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rai/node/node.cpp
View file

@ -3041,8 +3041,8 @@ bool rai::election::vote (std::shared_ptr<rai::vote> vote_a)
void rai::active_transactions::announce_votes ()
{
std::vector<rai::block_hash> inactive;
std::lock_guard<std::mutex> lock (mutex);
rai::transaction transaction (node.store.environment, nullptr, true);
std::lock_guard<std::mutex> lock (mutex);
{
size_t announcements (0);

2
rai/node/wallet.cpp
View file

@ -716,8 +716,8 @@ node (node_a)
void rai::wallet::enter_initial_password ()
{
std::lock_guard<std::recursive_mutex> lock (store.mutex);
rai::transaction transaction (store.environment, nullptr, true);
std::lock_guard<std::recursive_mutex> lock (store.mutex);
rai::raw_key password_l;
store.password.value (password_l);
if (password_l.data.is_zero ())