Fix broken error messages.

This commit is contained in:
Sean Bowe
2018-05-07 13:49:17 -06:00
parent e390a475c1
commit 8c57bbac15
4 changed files with 8 additions and 8 deletions

View File

@@ -173,7 +173,7 @@ bool CCoinsViewCache::GetNullifier(const uint256 &nullifier, ShieldedType type)
cacheToUse = &cacheSaplingNullifiers; cacheToUse = &cacheSaplingNullifiers;
break; break;
default: default:
throw std::runtime_error("Unknown nullifier type"); throw std::runtime_error("Unknown shielded type");
} }
CNullifiersMap::iterator it = cacheToUse->find(nullifier); CNullifiersMap::iterator it = cacheToUse->find(nullifier);
if (it != cacheToUse->end()) if (it != cacheToUse->end())
@@ -309,7 +309,7 @@ void CCoinsViewCache::PopAnchor(const uint256 &newrt, ShieldedType type) {
); );
break; break;
default: 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; return hashSaplingAnchor;
break; break;
default: default:
throw std::runtime_error("Unknown shielded type " + type); throw std::runtime_error("Unknown shielded type");
} }
} }

View File

@@ -82,7 +82,7 @@ public:
mapToUse = &mapSaplingNullifiers_; mapToUse = &mapSaplingNullifiers_;
break; break;
default: default:
throw std::runtime_error("Unknown nullifier type"); throw std::runtime_error("Unknown shielded type");
} }
std::map<uint256, bool>::const_iterator it = mapToUse->find(nf); std::map<uint256, bool>::const_iterator it = mapToUse->find(nf);
if (it == mapToUse->end()) { if (it == mapToUse->end()) {
@@ -103,7 +103,7 @@ public:
return hashBestSaplingAnchor_; return hashBestSaplingAnchor_;
break; break;
default: default:
throw std::runtime_error("Unknown shielded type " + type); throw std::runtime_error("Unknown shielded type");
} }
} }

View File

@@ -77,7 +77,7 @@ bool CCoinsViewDB::GetNullifier(const uint256 &nf, ShieldedType type) const {
dbChar = DB_SAPLING_NULLIFIER; dbChar = DB_SAPLING_NULLIFIER;
break; break;
default: default:
throw runtime_error("Unknown nullifier type"); throw runtime_error("Unknown shielded type");
} }
return db.Read(make_pair(dbChar, nf), spent); return db.Read(make_pair(dbChar, nf), spent);
} }
@@ -110,7 +110,7 @@ uint256 CCoinsViewDB::GetBestAnchor(ShieldedType type) const {
return ZCSaplingIncrementalMerkleTree::empty_root(); return ZCSaplingIncrementalMerkleTree::empty_root();
break; break;
default: default:
throw runtime_error("Unknown shielded type " + type); throw runtime_error("Unknown shielded type");
} }
return hashBestAnchor; return hashBestAnchor;

View File

@@ -235,7 +235,7 @@ void CTxMemPool::removeWithAnchor(const uint256 &invalidRoot, ShieldedType type)
} }
break; break;
default: default:
throw runtime_error("Unknown shielded type " + type); throw runtime_error("Unknown shielded type");
break; break;
} }
} }