BlockStorage/siadrive
Archived
1
0
Fork 0
Code Activity

[Unit Test] Create wallet

Browse Source
This commit is contained in:
Scott E. Graves
2017-02-03 18:16:33 -06:00
parent edf1818255
commit 9dfc1a9331
6 changed files with 145 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SiaDrive.Api/SiaApi.cpp
View File

@@ -4,9 +4,9 @@
using namespace Sia::Api;
CSiaApi::CSiaApi(const SiaHostConfig& hostConfig) :
_siaCurl(hostConfig),
_wallet(new CSiaWallet(_siaCurl))
{
_siaCurl.SetHostConfig(hostConfig);
}
CSiaApi::~CSiaApi()

3
SiaDrive.Api/SiaApi.h
View File

@@ -12,6 +12,8 @@ public:
{
Success,
NotImplemented,
RequestError,
WalletExists,
WalletLocked,
WalletUnlocked,
WalletNotCreated
@@ -42,6 +44,7 @@ public:
public:
_SiaApiError Create(const _SiaSeedLanguage& seedLanguage, String& seed);
bool Refresh();
_SiaApiError Restore(const String& seed);
_SiaApiError Lock();
_SiaApiError Unlock();

104
SiaDrive.Api/SiaCurl.cpp
View File

@@ -7,7 +7,12 @@ CSiaCurl::CSiaCurl() :
_curlHandle(curl_easy_init())
{
SetHostConfig({ L"localhost", 9980, L""});
curl_easy_setopt(_curlHandle, CURLOPT_USERAGENT, "Sia-Agent");
}
CSiaCurl::CSiaCurl(const SiaHostConfig& hostConfig) :
_curlHandle(curl_easy_init())
{
SetHostConfig(hostConfig);
}
CSiaCurl::~CSiaCurl()
@@ -43,32 +48,34 @@ std::string CSiaCurl::ConstructPath(const String& relativePath) const
SiaCurlError CSiaCurl::_Get(const String& path, json& response) const
{
std::string result;
SiaCurlError ret = SiaCurlError::Success;
if (API_SUCCESS(SiaCurlError, ret))
curl_easy_reset(_curlHandle);
curl_easy_setopt(_curlHandle, CURLOPT_USERAGENT, "Sia-Agent");
curl_easy_setopt(_curlHandle, CURLOPT_URL, ConstructPath(path).c_str());
curl_easy_setopt(_curlHandle, CURLOPT_WRITEFUNCTION, static_cast<size_t(*)(char*, size_t, size_t, void *)>([](char *buffer, size_t size, size_t nitems, void *outstream) -> size_t
{
curl_easy_setopt(_curlHandle, CURLOPT_URL, ConstructPath(path).c_str());
curl_easy_setopt(_curlHandle, CURLOPT_WRITEFUNCTION, static_cast<size_t(*)(char*, size_t, size_t, void *)>([](char *buffer, size_t size, size_t nitems, void *outstream) -> size_t
(*reinterpret_cast<std::string*>(outstream)) += std::string(reinterpret_cast<LPCSTR>(buffer), size * nitems);
return size * nitems;
}));
std::string result;
curl_easy_setopt(_curlHandle, CURLOPT_WRITEDATA, &result);
const CURLcode res = curl_easy_perform(_curlHandle);
SiaCurlError ret;
if (res == CURLE_OK)
{
ret = CheckApiError((response = json::parse(result.c_str())));
}
else
{
if ((res == CURLE_COULDNT_RESOLVE_HOST) || (res == CURLE_COULDNT_CONNECT))
{
(*reinterpret_cast<std::string*>(outstream)) += std::string(reinterpret_cast<LPCSTR>(buffer), size * nitems);
return size * nitems;
}));
curl_easy_setopt(_curlHandle, CURLOPT_WRITEDATA, &result);
const CURLcode res = curl_easy_perform(_curlHandle);
if (res == CURLE_OK)
{
ret = CheckApiError((response = json::parse(result.c_str())));
ret = SiaCurlError::NoResponse;
}
else
{
if ((res == CURLE_COULDNT_RESOLVE_HOST) || (res == CURLE_COULDNT_CONNECT))
{
ret = SiaCurlError::NoResponse;
}
else
{
ret = SiaCurlError::UnknownFailure;
}
ret = SiaCurlError::UnknownFailure;
}
}
@@ -104,13 +111,62 @@ String CSiaCurl::GetServerVersion() const
SiaCurlError CSiaCurl::Get(const String& path, json& response) const
{
std::string result;
SiaCurlError ret;
if (CheckVersion(ret))
{
ret = _Get(path, response);
}
return ret;
}
SiaCurlError CSiaCurl::Post(const String& path, const PostParameters& parameters, json& response) const
{
SiaCurlError ret;
if (CheckVersion(ret))
{
curl_easy_reset(_curlHandle);
curl_easy_setopt(_curlHandle, CURLOPT_USERAGENT, "Sia-Agent");
curl_easy_setopt(_curlHandle, CURLOPT_URL, ConstructPath(path).c_str());
curl_easy_setopt(_curlHandle, CURLOPT_WRITEFUNCTION, static_cast<size_t(*)(char*, size_t, size_t, void *)>([](char *buffer, size_t size, size_t nitems, void *outstream) -> size_t
{
(*reinterpret_cast<std::string*>(outstream)) += std::string(reinterpret_cast<LPCSTR>(buffer), size * nitems);
return size * nitems;
}));
std::string fields;
for (const auto& param : parameters)
{
if (fields.length())
{
fields += "&";
}
fields += (std::string(CW2A(param.first.c_str())) + "=" + std::string(CW2A(param.second.c_str())));
}
curl_easy_setopt(_curlHandle, CURLOPT_POSTFIELDS, fields.c_str());
std::string result;
curl_easy_setopt(_curlHandle, CURLOPT_WRITEDATA, &result);
const CURLcode res = curl_easy_perform(_curlHandle);
if (res == CURLE_OK)
{
ret = CheckApiError((response = json::parse(result.c_str())));
}
else
{
if ((res == CURLE_COULDNT_RESOLVE_HOST) || (res == CURLE_COULDNT_CONNECT))
{
ret = SiaCurlError::NoResponse;
}
else
{
ret = SiaCurlError::UnknownFailure;
}
}
}
return ret;
}

9
SiaDrive.Api/SiaCurl.h
View File

@@ -1,7 +1,6 @@
#pragma once
#include <SiaCommon.h>
// Forward curl
#include <unordered_map>
NS_BEGIN(Sia)
NS_BEGIN(Api)
@@ -19,9 +18,13 @@ public:
UnknownFailure
};
typedef std::unordered_map<String, String> _PostParameters;
public:
CSiaCurl();
CSiaCurl(const SiaHostConfig& hostConfig);
public:
~CSiaCurl();
@@ -41,9 +44,11 @@ private:
public:
String GetServerVersion() const;
_SiaCurlError Get(const String& path, json& result) const;
_SiaCurlError Post(const String& path, const _PostParameters& parameters, json& response) const;
};
typedef CSiaCurl::_SiaCurlError SiaCurlError;
typedef CSiaCurl::_PostParameters PostParameters;
NS_END(2)

55
SiaDrive.Api/SiaWallet.cpp
View File

@@ -3,12 +3,30 @@
using namespace Sia::Api;
static String SeedLangToString(const SiaSeedLanguage& lang)
{
switch (lang)
{
case SiaSeedLanguage::English:
return L"english";
case SiaSeedLanguage::German:
return L"german";
case SiaSeedLanguage::Japanese:
return L"japanese";
default:
throw std::exception("Seed language not implemented");
}
}
CSiaApi::_CSiaWallet::_CSiaWallet(CSiaCurl& siaCurl) :
_siaCurl(siaCurl),
_Created(false),
_Locked(false)
{
Refresh();
}
CSiaApi::_CSiaWallet::~_CSiaWallet()
@@ -16,15 +34,48 @@ CSiaApi::_CSiaWallet::~_CSiaWallet()
}
bool CSiaApi::_CSiaWallet::Refresh()
{
json result;
SiaCurlError error = _siaCurl.Get(L"/wallet", result);
if (API_SUCCESS(SiaCurlError, error))
{
SetCreated(result["encrypted"].get<bool>());
SetLocked(result["unlocked"].get<bool>());
return true;
}
return false;
}
SiaApiError CSiaApi::_CSiaWallet::Create(const SiaSeedLanguage& seedLanguage, String& seed)
{
SiaApiError error = SiaApiError::NotImplemented;
SiaApiError error = SiaApiError::RequestError;
if (Refresh())
{
error = SiaApiError::WalletExists;
if (!GetCreated())
{
error = SiaApiError::RequestError;
json result;
SiaCurlError cerror = _siaCurl.Post(L"/wallet/init", { {L"dictionary", SeedLangToString(seedLanguage)} }, result);
if (API_SUCCESS(SiaCurlError, cerror))
{
error = SiaApiError::Success;
seed = CA2W(result["primaryseed"].get<std::string>().c_str());
Refresh();
}
}
}
return error;
}
SiaApiError CSiaApi::_CSiaWallet::Restore(const String& seed)
{
SiaApiError error = SiaApiError::NotImplemented;
// TODO Future enhancement
return error;
}

1
UnitTests/SiaWalletApiTests.cpp
View File

@@ -29,6 +29,7 @@ namespace UnitTests
String seed;
Assert::IsTrue(API_SUCCESS(SiaApiError, wallet->Create(SiaSeedLanguage::English, seed)));
Assert::IsTrue(wallet->GetCreated());
Assert::IsFalse(wallet->GetLocked());
}
};
}