diff options
| author | Gavin Andresen <[email protected]> | 2013-11-01 12:06:03 +1000 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2013-11-01 12:13:38 +1000 |
| commit | 837369806ac39717b3294e5b698307f0f0011a6d (patch) | |
| tree | 66ea7ef00247c589ac7ebf9e3466e892f730b8a0 /src/core.cpp | |
| parent | Merge pull request #3114 (diff) | |
| parent | Show short scriptPubKeys correctly (diff) | |
| download | discoin-837369806ac39717b3294e5b698307f0f0011a6d.tar.xz discoin-837369806ac39717b3294e5b698307f0f0011a6d.zip | |
Merge pull request #3128
0056095 Show short scriptPubKeys correctly (Peter Todd)
22de68d Relay OP_RETURN TxOut as standard transaction type (Peter Todd)
Signed-off-by: Gavin Andresen <[email protected]>
Diffstat (limited to 'src/core.cpp')
| -rw-r--r-- | src/core.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core.cpp b/src/core.cpp index 99b5c6641..5512f81b6 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -63,8 +63,6 @@ uint256 CTxOut::GetHash() const std::string CTxOut::ToString() const { - if (scriptPubKey.size() < 6) - return "CTxOut(error)"; return strprintf("CTxOut(nValue=%"PRI64d".%08"PRI64d", scriptPubKey=%s)", nValue / COIN, nValue % COIN, scriptPubKey.ToString().substr(0,30).c_str()); } |