4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-13 20:06:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5895

Browse Source 
fdc00d0 unit tests: replace global var with lambda returning static local var (stoffu)
This commit is contained in:
luigi1111 2019-09-30 18:46:34 -05:00
commit 40501cc131
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit_tests/multiexp.cpp
View File

@ -32,10 +32,10 @@
#include "ringct/rctOps.h" #include "ringct/rctOps.h"
#include "ringct/multiexp.h" #include "ringct/multiexp.h"
static const rct::key TESTSCALAR = rct::skGen(); #define TESTSCALAR []{ static const rct::key TESTSCALAR = rct::skGen(); return TESTSCALAR; }()
static const rct::key TESTPOW2SCALAR = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}; #define TESTPOW2SCALAR []{ static const rct::key TESTPOW2SCALAR = {{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}; return TESTPOW2SCALAR; }()
static const rct::key TESTSMALLSCALAR = {{5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}; #define TESTSMALLSCALAR []{ static const rct::key TESTSMALLSCALAR = {{5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}; return TESTSMALLSCALAR; }()
static const rct::key TESTPOINT = rct::scalarmultBase(rct::skGen()); #define TESTPOINT []{ static const rct::key TESTPOINT = rct::scalarmultBase(rct::skGen()); return TESTPOINT; }()
static rct::key basic(const std::vector<rct::MultiexpData> &data) static rct::key basic(const std::vector<rct::MultiexpData> &data)
{ {

10
tests/unit_tests/ringdb.cpp
View File

@ -65,11 +65,11 @@ static std::pair<uint64_t, uint64_t> generate_output()
} }
static const crypto::chacha_key KEY_1 = generate_chacha_key(); #define KEY_1 []{ static const crypto::chacha_key KEY_1 = generate_chacha_key(); return KEY_1; }()
static const crypto::chacha_key KEY_2 = generate_chacha_key(); #define KEY_2 []{ static const crypto::chacha_key KEY_2 = generate_chacha_key(); return KEY_2; }()
static const crypto::key_image KEY_IMAGE_1 = generate_key_image(); #define KEY_IMAGE_1 []{ static const crypto::key_image KEY_IMAGE_1 = generate_key_image(); return KEY_IMAGE_1; }()
static const std::pair<uint64_t, uint64_t> OUTPUT_1 = generate_output(); #define OUTPUT_1 []{ static const std::pair<uint64_t, uint64_t> OUTPUT_1 = generate_output(); return OUTPUT_1; }()
static const std::pair<uint64_t, uint64_t> OUTPUT_2 = generate_output(); #define OUTPUT_2 []{ static const std::pair<uint64_t, uint64_t> OUTPUT_2 = generate_output(); return OUTPUT_2; }()
class RingDB: public tools::ringdb class RingDB: public tools::ringdb
{ {