LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

tests: Avoid test suite name collision in wallet crypto_tests

Browse source
This commit is contained in:
MarcoFalke 2018-04-05 16:00:39 -04:00 committed by practicalswift
parent 5f0c6a7b0e
commit 3ebfb2dadb
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Makefile.test.include
View file

@ -94,7 +94,7 @@ BITCOIN_TESTS += \
wallet/test/wallet_test_fixture.h \ wallet/test/wallet_test_fixture.h \
wallet/test/accounting_tests.cpp \ wallet/test/accounting_tests.cpp \
wallet/test/wallet_tests.cpp \ wallet/test/wallet_tests.cpp \
wallet/test/crypto_tests.cpp \ wallet/test/wallet_crypto_tests.cpp \
wallet/test/coinselector_tests.cpp wallet/test/coinselector_tests.cpp
endif endif

4
src/wallet/crypter.h
View file

@ -67,7 +67,7 @@ public:
typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial; typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial;
namespace crypto_tests namespace wallet_crypto_tests
{ {
class TestCrypter; class TestCrypter;
} }
@ -75,7 +75,7 @@ namespace crypto_tests
/** Encryption/decryption context with key information */ /** Encryption/decryption context with key information */
class CCrypter class CCrypter
{ {
friend class crypto_tests::TestCrypter; // for test access to chKey/chIV friend class wallet_crypto_tests::TestCrypter; // for test access to chKey/chIV
private: private:
std::vector<unsigned char, secure_allocator<unsigned char>> vchKey; std::vector<unsigned char, secure_allocator<unsigned char>> vchKey;
std::vector<unsigned char, secure_allocator<unsigned char>> vchIV; std::vector<unsigned char, secure_allocator<unsigned char>> vchIV;

2
src/wallet/test/crypto_tests.cpp → src/wallet/test/wallet_crypto_tests.cpp
View file

@ -10,7 +10,7 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
BOOST_FIXTURE_TEST_SUITE(crypto_tests, BasicTestingSetup) BOOST_FIXTURE_TEST_SUITE(wallet_crypto_tests, BasicTestingSetup)
class TestCrypter class TestCrypter
{ {