Remove conditionals for featureMultiSign enabled 27Jun2016

This commit is contained in:
Scott Schurr
2020-01-15 14:41:21 -08:00
committed by Manoj doshi
parent c48be14f4f
commit 6e4945c56b
14 changed files with 21 additions and 116 deletions

View File

@@ -177,24 +177,16 @@ void STTx::sign (
tid_ = getHash(HashPrefix::transactionID);
}
std::pair<bool, std::string> STTx::checkSign(bool allowMultiSign) const
std::pair<bool, std::string> STTx::checkSign() const
{
std::pair<bool, std::string> ret {false, ""};
try
{
if (allowMultiSign)
{
// Determine whether we're single- or multi-signing by looking
// at the SigningPubKey. It it's empty we must be
// multi-signing. Otherwise we're single-signing.
Blob const& signingPubKey = getFieldVL (sfSigningPubKey);
ret = signingPubKey.empty () ?
checkMultiSign () : checkSingleSign ();
}
else
{
ret = checkSingleSign ();
}
// Determine whether we're single- or multi-signing by looking
// at the SigningPubKey. It it's empty we must be
// multi-signing. Otherwise we're single-signing.
Blob const& signingPubKey = getFieldVL (sfSigningPubKey);
ret = signingPubKey.empty () ? checkMultiSign () : checkSingleSign ();
}
catch (std::exception const&)
{