From 5c4a47cbf84c9c5ea805990801d09800c863bbc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Gr=C3=B6n?= Date: Sun, 7 Jan 2018 16:11:33 +0100 Subject: [PATCH] Add actual header file for utilities in gtest/utils.cpp It's not best practice to not use headers. --- src/Makefile.gtest.include | 1 + src/gtest/test_random.cpp | 4 +--- src/gtest/test_transaction.cpp | 3 +-- src/gtest/utils.cpp | 2 ++ src/gtest/utils.h | 7 +++++++ 5 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 src/gtest/utils.h diff --git a/src/Makefile.gtest.include b/src/Makefile.gtest.include index 522bfa84a..0002981da 100644 --- a/src/Makefile.gtest.include +++ b/src/Makefile.gtest.include @@ -7,6 +7,7 @@ noinst_PROGRAMS += zcash-gtest zcash_gtest_SOURCES = \ gtest/main.cpp \ gtest/utils.cpp \ + gtest/utils.h \ gtest/test_checktransaction.cpp \ gtest/json_test_vectors.cpp \ gtest/json_test_vectors.h \ diff --git a/src/gtest/test_random.cpp b/src/gtest/test_random.cpp index d89702bcd..9ae2a6d82 100644 --- a/src/gtest/test_random.cpp +++ b/src/gtest/test_random.cpp @@ -1,9 +1,7 @@ #include #include "random.h" - -extern int GenZero(int n); -extern int GenMax(int n); +#include "gtest/utils.h" TEST(Random, MappedShuffle) { std::vector a {8, 4, 6, 3, 5}; diff --git a/src/gtest/test_transaction.cpp b/src/gtest/test_transaction.cpp index fb68fd35c..c80ed2b14 100644 --- a/src/gtest/test_transaction.cpp +++ b/src/gtest/test_transaction.cpp @@ -1,12 +1,11 @@ #include +#include "gtest/utils.h" #include "primitives/transaction.h" #include "zcash/Note.hpp" #include "zcash/Address.hpp" extern ZCJoinSplit* params; -extern int GenZero(int n); -extern int GenMax(int n); TEST(Transaction, JSDescriptionRandomized) { // construct a merkle tree diff --git a/src/gtest/utils.cpp b/src/gtest/utils.cpp index 527e613e2..30d452c82 100644 --- a/src/gtest/utils.cpp +++ b/src/gtest/utils.cpp @@ -1,3 +1,5 @@ +#include "gtest/utils.h" + int GenZero(int n) { return 0; diff --git a/src/gtest/utils.h b/src/gtest/utils.h new file mode 100644 index 000000000..d3e433ff8 --- /dev/null +++ b/src/gtest/utils.h @@ -0,0 +1,7 @@ +#ifndef BITCOIN_GTEST_UTILS_H +#define BITCOIN_GTEST_UTILS_H + +int GenZero(int n); +int GenMax(int n); + +#endif