Merge #855: Remove another mention of Liquid-Qt

607cfc3df Remove another mention of Liquid-Qt (Steven Roose)

Pull request description:

  This should be the last mention of `#if LIQUID` and `Liquid-Qt` that my grep can find.

Tree-SHA512: 75c3675c075787de076fbb3f191b779e9db4afee872aaef229f03eb419ec1fdc0393b41728cf8e3baf5730271f2e76b0fab9000c37a4932bbc439cd7725849ec
This commit is contained in:
Steven Roose 2020-04-08 07:15:32 +01:00
commit 1427dfd6e7
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
2 changed files with 2 additions and 7 deletions

View file

@ -49,15 +49,10 @@ static const int MAX_URI_LENGTH = 255;
#define QAPP_ORG_NAME "Bitcoin"
#define QAPP_ORG_DOMAIN "bitcoin.org"
#if LIQUID
#define QAPP_APP_NAME_DEFAULT "Liquid-Qt"
#define QAPP_APP_NAME_TESTNET "Liquid-Qt-testnet"
#define QAPP_APP_NAME_REGTEST "Liquid-Qt-regtest"
#else
#define QAPP_APP_NAME_DEFAULT "Elements-Qt"
#define QAPP_APP_NAME_TESTNET "Elements-Qt-testnet"
#define QAPP_APP_NAME_REGTEST "Elements-Qt-regtest"
#endif
#define QAPP_APP_NAME_LIQUID "Elements-Qt (Liquid)"
/* One gigabyte (GB) in bytes */
static constexpr uint64_t GB_BYTES{1000000000};

View file

@ -19,7 +19,7 @@ static const struct {
} network_styles[] = {
{"main", QAPP_APP_NAME_DEFAULT, 0, 0},
{"test", QAPP_APP_NAME_TESTNET, 70, 30},
{"liquidv1", "Liquid-Qt-liquidv1", 0, 0},
{"liquidv1", QAPP_APP_NAME_LIQUID, 0, 0},
{"regtest", QAPP_APP_NAME_REGTEST, 160, 30}
};
static const unsigned network_styles_count = sizeof(network_styles)/sizeof(*network_styles);