Auto merge of #4320 - zancas:4319_spurious_virtual, r=daira

Remove spurious "virtual" and add "override" in leaf subclasses

Fixes: #4319

The use of virtual on these lines was unnecessary.

I ran:

"rm -f ./src/zcash-gtest && rm -f ./src/gtest/*.o && rm -f ./src/gtest/*.Po && make && ./src/zcash-gtest"

before and after making the change.   In both cases:

206 test ran from 32 cases and 1 test was DISABLED
This commit is contained in:
Homu 2020-02-02 13:49:09 +00:00
commit 7f02ade06b
3 changed files with 6 additions and 6 deletions

View File

@ -70,11 +70,11 @@ TEST(CheckBlock, BlockSproutRejectsBadVersion) {
class ContextualCheckBlockTest : public ::testing::Test {
protected:
virtual void SetUp() {
void SetUp() override {
SelectParams(CBaseChainParams::MAIN);
}
virtual void TearDown() {
void TearDown() override {
// Revert to test default. No-op on mainnet params.
RegtestDeactivateSapling();
}

View File

@ -34,14 +34,14 @@ static bool ThreadSafeMessageBox(MockUIInterface *mock,
class DeprecationTest : public ::testing::Test {
protected:
virtual void SetUp() {
void SetUp() override {
uiInterface.ThreadSafeMessageBox.disconnect_all_slots();
uiInterface.ThreadSafeMessageBox.connect(boost::bind(ThreadSafeMessageBox, &mock_, _1, _2, _3));
SelectParams(CBaseChainParams::MAIN);
}
virtual void TearDown() {
void TearDown() override {
fRequestShutdown = false;
mapArgs.clear();
}

View File

@ -7,10 +7,10 @@
class UpgradesTest : public ::testing::Test {
protected:
virtual void SetUp() {
void SetUp() override {
}
virtual void TearDown() {
void TearDown() override {
// Revert to default
UpdateNetworkUpgradeParameters(Consensus::UPGRADE_TESTDUMMY, Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT);
}