Skip to content

Commit

Permalink
Merge #2855: Delete redundant util/fetch-params.sh
Browse files Browse the repository at this point in the history
2c73d25 Delete fetch-params.sh (Liquid)

Pull request description:

  We previously discussed fixing the `fetch-params.sh` script, but after discussion its not actually used and is redundant.
  This script is broken and `install-params.sh` works fine, so lets just remove it.

ACKs for top commit:
  Fuzzbawls:
    ACK 2c73d25
  panleone:
    utACK 2c73d25

Tree-SHA512: 2dee1dadba54b069471f40be6e3eb52242c4ec15d2a6a49e20ac2633cd98b707a594b0c53b406d7b64710c0d6fe6bbd6cd425e706ad0f6dcdd469609f80f9aae
  • Loading branch information
Fuzzbawls committed Jul 19, 2023
2 parents 8c4ffa6 + 2c73d25 commit 616cc48
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 238 deletions.
16 changes: 10 additions & 6 deletions src/init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -741,12 +741,16 @@ static void LoadSaplingParams()
try {
initZKSNARKS();
} catch (std::runtime_error &e) {
uiInterface.ThreadSafeMessageBox(strprintf(
_("Cannot find the Sapling parameters in the following directory:\n"
"%s\n"
"Please run 'sapling-fetch-params' or './util/fetch-params.sh' and then restart."),
ZC_GetParamsDir()),
"", CClientUIInterface::MSG_ERROR);
std::string strError = strprintf(_("Cannot find the Sapling parameters in the following directory:\n%s"), ZC_GetParamsDir());
std::string strErrorPosix = strprintf(_("Please run the included %s script and then restart."), "install-params.sh");
std::string strErrorWin = strprintf(_("Please copy the included params files to the %s directory."), ZC_GetParamsDir());
uiInterface.ThreadSafeMessageBox(strError + "\n"
#ifndef WIN32
+ strErrorPosix,
#else
+ strErrorWin,
#endif
"", CClientUIInterface::MSG_ERROR);
StartShutdown();
return;
}
Expand Down
232 changes: 0 additions & 232 deletions util/fetch-params.sh

This file was deleted.

0 comments on commit 616cc48

Please sign in to comment.