Merge rust-bitcoin/rust-miniscript#756: feat: add MaxBareScriptSizeExceeded err for bare consensus check

834bd3dcc9bbcecd8603d85fc17ddb82f2d4ba65 feat: add MaxBareScriptSizeExceeded err for bare consensus check (ChrisCho-H)

Pull request description:

  `BareCtx` consensus validity check returns `MaxWitnessScriptSizeExceeded` err when exceeding script size limit, which is wrong and confusing. Adding `MaxBareScriptSizeExceeded` and using it instead can clearly give a correct message on compile error.

ACKs for top commit:
  apoelstra:
    ACK 834bd3dcc9bbcecd8603d85fc17ddb82f2d4ba65; successfully ran local tests; Yeah, this seems like a good idea

Tree-SHA512: 4dae0617bdaf1aee7ffd74875471a9dc550b4e3fdd4499894d4172c047f8dbf8b3ca5dff92868999f2ed0356400b9327003b6ac249cd428606204dc5f0506c04

Author: heap-coder

src/miniscript/context.rs

@@ -52,6 +52,9 @@ pub enum ScriptContextError {
     /// The Miniscript (under p2sh context) corresponding Script would be
     /// larger than `MAX_SCRIPT_ELEMENT_SIZE` bytes.
     MaxRedeemScriptSizeExceeded,
+    /// The Miniscript(under bare context) corresponding
+    /// Script would be larger than `MAX_SCRIPT_SIZE` bytes.
+    MaxBareScriptSizeExceeded,
     /// The policy rules of bitcoin core only permit Script size upto 1650 bytes
     MaxScriptSigSizeExceeded,
     /// Impossible to satisfy the miniscript under the current context
@@ -80,6 +83,7 @@ impl error::Error for ScriptContextError {
             | MaxOpCountExceeded
             | MaxWitnessScriptSizeExceeded
             | MaxRedeemScriptSizeExceeded
+            | MaxBareScriptSizeExceeded
             | MaxScriptSigSizeExceeded
             | ImpossibleSatisfaction
             | TaprootMultiDisabled
@@ -127,6 +131,11 @@ impl fmt::Display for ScriptContextError {
                 "The Miniscript corresponding Script would be larger than \
                 MAX_SCRIPT_ELEMENT_SIZE bytes."
             ),
+            ScriptContextError::MaxBareScriptSizeExceeded => write!(
+                f,
+                "The Miniscript corresponding Script would be larger than \
+                MAX_SCRIPT_SIZE bytes."
+            ),
             ScriptContextError::MaxScriptSigSizeExceeded => write!(
                 f,
                 "At least one satisfaction in Miniscript would be larger than \
@@ -740,7 +749,7 @@ impl ScriptContext for BareCtx {
         match node_checked {
             Ok(_) => {
                 if ms.ext.pk_cost > MAX_SCRIPT_SIZE {
-                    Err(ScriptContextError::MaxWitnessScriptSizeExceeded)
+                    Err(ScriptContextError::MaxBareScriptSizeExceeded)
                 } else {
                     Ok(())
                 }

src/miniscript/mod.rs

@@ -1694,7 +1694,7 @@ mod tests {
         );
         assert_eq!(
             bare_multi_ms.unwrap_err().to_string(),
-            "The Miniscript corresponding Script would be larger than MAX_STANDARD_P2WSH_SCRIPT_SIZE bytes."
+            "The Miniscript corresponding Script would be larger than MAX_SCRIPT_SIZE bytes."
         );
     }
 }