Merge 0130abbdb7 into merged_master (Bitcoin PR #18018)

This commit is contained in:
Andrew Poelstra 2020-11-14 18:08:09 +00:00
commit d0366a3a8f

View file

@ -843,6 +843,7 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
reason.clear();
BOOST_CHECK(!IsStandardTx(CTransaction(t), reason));
BOOST_CHECK_EQUAL(reason, "bare-multisig");
fIsBareMultisigStd = DEFAULT_PERMIT_BAREMULTISIG;
}
BOOST_AUTO_TEST_SUITE_END()