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

Fixing issues with wallet.

Browse source
This commit is contained in:
clemahieu 2014-10-26 13:21:26 -05:00
commit 532cff9e55
3 changed files with 38 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rai/core/core.cpp
View file

@ -478,7 +478,9 @@ password (0, 1024)
{
leveldb::Options options;
options.create_if_missing = true;
auto status (leveldb::DB::Open (options, (path_a / "wallet.ldb").string (), &handle));
leveldb::DB * db (nullptr);
auto status (leveldb::DB::Open (options, (path_a / "wallet.ldb").string (), &db));
handle.reset (db);
if (status.ok ())
{
rai::uint256_union wallet_password_key;
@ -512,6 +514,12 @@ password (0, 1024)
wallet_key.clear ();
password_l.clear ();
}
else
{
auto password_l (derive_key (""));
password.value_set (password_l);
}
init_a = false;
}
else
{
@ -607,7 +615,7 @@ rai::key_entry & rai::key_iterator::operator -> ()
rai::key_iterator rai::wallet::begin ()
{
rai::key_iterator result (handle);
rai::key_iterator result (handle.get ());
for (auto i (0); i < special_count; ++i)
{
assert (result != end ());
@ -618,8 +626,8 @@ rai::key_iterator rai::wallet::begin ()
rai::key_iterator rai::wallet::find (rai::uint256_union const & key)
{
rai::key_iterator result (handle, key);
rai::key_iterator end (handle, nullptr);
rai::key_iterator result (handle.get (), key);
rai::key_iterator end (handle.get (), nullptr);
if (result != end)
{
if (result.current.first == key)
@ -639,7 +647,7 @@ rai::key_iterator rai::wallet::find (rai::uint256_union const & key)
rai::key_iterator rai::wallet::end ()
{
return rai::key_iterator (handle, nullptr);
return rai::key_iterator (handle.get (), nullptr);
}
bool rai::key_iterator::operator == (rai::key_iterator const & other_a) const

2
rai/core/core.hpp
View file

@ -285,7 +285,7 @@ namespace rai {
static rai::uint256_union const check_special;
static int const special_count;
private:
leveldb::DB * handle;
std::unique_ptr <leveldb::DB> handle;
};
class operation
{

24
rai/test/wallet_test.cpp
View file

@ -330,6 +330,13 @@ TEST (wallet, bad_path)
ASSERT_TRUE (init);
}
TEST (wallet, correct)
{
bool init (true);
rai::wallet store (init, boost::filesystem::unique_path ());
ASSERT_FALSE (init);
}
TEST (wallet, already_open)
{
auto path (boost::filesystem::unique_path ());
@ -340,4 +347,21 @@ TEST (wallet, already_open)
bool init;
rai::wallet store (init, path);
ASSERT_TRUE (init);
}
TEST (wallet, repoen_default_password)
{
auto path (boost::filesystem::unique_path ());
{
bool init;
rai::wallet wallet (init, path);
ASSERT_FALSE (init);
ASSERT_TRUE (wallet.valid_password ());
}
{
bool init;
rai::wallet wallet (init, path);
ASSERT_FALSE (init);
ASSERT_TRUE (wallet.valid_password ());
}
}