Skip to content

Commit 3ebfb2d

Browse files
MarcoFalkepracticalswift
authored andcommitted
tests: Avoid test suite name collision in wallet crypto_tests
1 parent 5f0c6a7 commit 3ebfb2d

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/Makefile.test.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ BITCOIN_TESTS += \
9494
wallet/test/wallet_test_fixture.h \
9595
wallet/test/accounting_tests.cpp \
9696
wallet/test/wallet_tests.cpp \
97-
wallet/test/crypto_tests.cpp \
97+
wallet/test/wallet_crypto_tests.cpp \
9898
wallet/test/coinselector_tests.cpp
9999
endif
100100

src/wallet/crypter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ class CMasterKey
6767

6868
typedef std::vector<unsigned char, secure_allocator<unsigned char> > CKeyingMaterial;
6969

70-
namespace crypto_tests
70+
namespace wallet_crypto_tests
7171
{
7272
class TestCrypter;
7373
}
7474

7575
/** Encryption/decryption context with key information */
7676
class CCrypter
7777
{
78-
friend class crypto_tests::TestCrypter; // for test access to chKey/chIV
78+
friend class wallet_crypto_tests::TestCrypter; // for test access to chKey/chIV
7979
private:
8080
std::vector<unsigned char, secure_allocator<unsigned char>> vchKey;
8181
std::vector<unsigned char, secure_allocator<unsigned char>> vchIV;

src/wallet/test/crypto_tests.cpp renamed to src/wallet/test/wallet_crypto_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#include <boost/test/unit_test.hpp>
1212

13-
BOOST_FIXTURE_TEST_SUITE(crypto_tests, BasicTestingSetup)
13+
BOOST_FIXTURE_TEST_SUITE(wallet_crypto_tests, BasicTestingSetup)
1414

1515
class TestCrypter
1616
{

0 commit comments

Comments
 (0)