diff --git a/src/coins.cpp b/src/coins.cpp index 508401ade..0ae74af1d 100644 --- a/src/coins.cpp +++ b/src/coins.cpp @@ -173,7 +173,7 @@ bool CCoinsViewCache::GetNullifier(const uint256 &nullifier, ShieldedType type) cacheToUse = &cacheSaplingNullifiers; break; default: - throw std::runtime_error("Unknown nullifier type"); + throw std::runtime_error("Unknown shielded type"); } CNullifiersMap::iterator it = cacheToUse->find(nullifier); if (it != cacheToUse->end()) @@ -309,7 +309,7 @@ void CCoinsViewCache::PopAnchor(const uint256 &newrt, ShieldedType type) { ); break; default: - throw std::runtime_error("Unknown shielded type " + type); + throw std::runtime_error("Unknown shielded type"); } } @@ -396,7 +396,7 @@ uint256 CCoinsViewCache::GetBestAnchor(ShieldedType type) const { return hashSaplingAnchor; break; default: - throw std::runtime_error("Unknown shielded type " + type); + throw std::runtime_error("Unknown shielded type"); } } diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp index 6f391b7ac..c1bd8a553 100644 --- a/src/test/coins_tests.cpp +++ b/src/test/coins_tests.cpp @@ -82,7 +82,7 @@ public: mapToUse = &mapSaplingNullifiers_; break; default: - throw std::runtime_error("Unknown nullifier type"); + throw std::runtime_error("Unknown shielded type"); } std::map::const_iterator it = mapToUse->find(nf); if (it == mapToUse->end()) { @@ -103,7 +103,7 @@ public: return hashBestSaplingAnchor_; break; default: - throw std::runtime_error("Unknown shielded type " + type); + throw std::runtime_error("Unknown shielded type"); } } diff --git a/src/txdb.cpp b/src/txdb.cpp index 68424b226..0f1382e6c 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -77,7 +77,7 @@ bool CCoinsViewDB::GetNullifier(const uint256 &nf, ShieldedType type) const { dbChar = DB_SAPLING_NULLIFIER; break; default: - throw runtime_error("Unknown nullifier type"); + throw runtime_error("Unknown shielded type"); } return db.Read(make_pair(dbChar, nf), spent); } @@ -110,7 +110,7 @@ uint256 CCoinsViewDB::GetBestAnchor(ShieldedType type) const { return ZCSaplingIncrementalMerkleTree::empty_root(); break; default: - throw runtime_error("Unknown shielded type " + type); + throw runtime_error("Unknown shielded type"); } return hashBestAnchor; diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 6debd55b8..703806667 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -235,7 +235,7 @@ void CTxMemPool::removeWithAnchor(const uint256 &invalidRoot, ShieldedType type) } break; default: - throw runtime_error("Unknown shielded type " + type); + throw runtime_error("Unknown shielded type"); break; } }