Browse Source

Clean up

sietch
Duke Leto 5 years ago
parent
commit
1c5e3e71b8
  1. 6
      qa/hush/full-test-suite.sh
  2. 5
      src/gtest/test_deprecation.cpp
  3. 6
      src/wallet/rpcdump.cpp

6
qa/hush/full-test-suite.sh

@ -1,6 +1,8 @@
#!/usr/bin/env python2
# Copyright (c) 2019-2020 The Hush developers
# Released under the GPLv3
#
# Execute all of the automated tests related to Zcash.
# Execute all of the automated tests related to Hush
#
import argparse
@ -198,4 +200,4 @@ def main():
sys.exit(1)
if __name__ == '__main__':
main()
main()

5
src/gtest/test_deprecation.cpp

@ -1,3 +1,6 @@
// Copyright (c) 2019-2020 The Hush developers
// Released under the GPLv3
#include <gmock/gmock.h>
#include <gtest/gtest.h>
@ -135,7 +138,7 @@ TEST_F(DeprecationTest, AlertNotify) {
// -alertnotify restricts the message to safe characters.
auto expectedMsg = strprintf(
"This version will be deprecated at block height %d, and will automatically shut down. You should upgrade to the latest version of Zcash.",
"This version will be deprecated at block height %d, and will automatically shut down. You should upgrade to the latest version of Hush.",
DEPRECATION_HEIGHT);
// Windows built-in echo semantics are different than posixy shells. Quotes and

6
src/wallet/rpcdump.cpp

@ -1,5 +1,5 @@
// Copyright (c) 2009-2014 The Bitcoin Core developers
// Copyright (c) 2019 The Hush developers
// Copyright (c) 2019-2020 The Hush developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -405,7 +405,7 @@ UniValue importwallet_impl(const UniValue& params, bool fHelp, bool fImportZKeys
if (vstr.size() < 2)
continue;
// Let's see if the address is a valid Zcash spending key
// Let's see if the address is a valid Hush spending key
if (fImportZKeys) {
auto spendingkey = DecodeSpendingKey(vstr[0]);
int64_t nTime = DecodeDumpTime(vstr[1]);
@ -424,7 +424,7 @@ UniValue importwallet_impl(const UniValue& params, bool fHelp, bool fImportZKeys
continue;
} else {
LogPrint("zrpc", "Importing detected an error: invalid spending key. Trying as a transparent key...\n");
// Not a valid spending key, so carry on and see if it's a Zcash style t-address.
// Not a valid spending key, so carry on and see if it's a Hush transparent address
}
}

Loading…
Cancel
Save