diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-06-16 17:30:53 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-06-16 17:41:27 +0200 |
| commit | 807691ca96a1a4b0655f6ea80b721b940dd29a39 (patch) | |
| tree | 66a7583a17c11ea84a6e1a2f08356907d4e5cfb1 /src/rpcblockchain.cpp | |
| parent | Merge pull request #4337 (diff) | |
| parent | add NetworkIDString() to chainparams (diff) | |
| download | discoin-807691ca96a1a4b0655f6ea80b721b940dd29a39.tar.xz discoin-807691ca96a1a4b0655f6ea80b721b940dd29a39.zip | |
Merge pull request #4326
f5ae6c9 add NetworkIDString() to chainparams (Philip Kaufmann)
Diffstat (limited to 'src/rpcblockchain.cpp')
| -rw-r--r-- | src/rpcblockchain.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp index 2a21fb462..0fabc8687 100644 --- a/src/rpcblockchain.cpp +++ b/src/rpcblockchain.cpp @@ -451,14 +451,11 @@ Value getblockchaininfo(const Array& params, bool fHelp) ); Object obj; - std::string chain = Params().DataDir(); - if(chain.empty()) - chain = "main"; - obj.push_back(Pair("chain", chain)); - obj.push_back(Pair("blocks", (int)chainActive.Height())); - obj.push_back(Pair("bestblockhash", chainActive.Tip()->GetBlockHash().GetHex())); - obj.push_back(Pair("difficulty", (double)GetDifficulty())); - obj.push_back(Pair("verificationprogress", Checkpoints::GuessVerificationProgress(chainActive.Tip()))); - obj.push_back(Pair("chainwork", chainActive.Tip()->nChainWork.GetHex())); + obj.push_back(Pair("chain", Params().NetworkIDString())); + obj.push_back(Pair("blocks", (int)chainActive.Height())); + obj.push_back(Pair("bestblockhash", chainActive.Tip()->GetBlockHash().GetHex())); + obj.push_back(Pair("difficulty", (double)GetDifficulty())); + obj.push_back(Pair("verificationprogress", Checkpoints::GuessVerificationProgress(chainActive.Tip()))); + obj.push_back(Pair("chainwork", chainActive.Tip()->nChainWork.GetHex())); return obj; } |