add NetworkIDString() to chainparams

- returns the BIP70 network string
- use that new function in the core and GUI code and remove unused code
  and functions
This commit is contained in:
Philip Kaufmann
2014-06-11 12:23:49 +02:00
parent 3f39b9d455
commit f5ae6c9826
8 changed files with 14 additions and 33 deletions

View File

@@ -79,6 +79,8 @@ public:
* until nGenProcLimit blocks are generated */
bool MineBlocksOnDemand() const { return fMineBlocksOnDemand; }
Network NetworkID() const { return networkID; }
/* Return the BIP70 network string (main, test or regtest) */
std::string NetworkIDString() const { return strNetworkID; }
const vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; }
const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; }
const vector<CAddress>& FixedSeeds() const { return vFixedSeeds; }
@@ -102,6 +104,7 @@ protected:
vector<CDNSSeedData> vSeeds;
std::vector<unsigned char> base58Prefixes[MAX_BASE58_TYPES];
Network networkID;
std::string strNetworkID;
CBlock genesis;
vector<CAddress> vFixedSeeds;
bool fRequireRPCPassword;