Merge remote-tracking branch 'origin/unstable' into tree-states-update

testing/ef_tests/Cargo.toml

@@ -7,7 +7,6 @@ edition = { workspace = true }
 [features]
 # `ef_tests` feature must be enabled to actually run the tests
 ef_tests = []
-milagro = ["bls/milagro"]
 fake_crypto = ["bls/fake_crypto"]
 portable = ["beacon_chain/portable"]
 

testing/ef_tests/src/cases/bls_eth_aggregate_pubkeys.rs

@@ -31,10 +31,6 @@ impl Case for BlsEthAggregatePubkeys {
             {
                 return Ok(());
             }
-            #[cfg(feature = "milagro")]
-            Err(bls::Error::MilagroError(_)) if self.output.is_none() => {
-                return Ok(());
-            }
             Err(e) => return Err(Error::FailedToParseTest(format!("{:?}", e))),
         };
 

testing/ef_tests/src/decode.rs

@@ -71,9 +71,7 @@ where
     f(&bytes).map_err(|e| {
         match e {
             // NOTE: this is a bit hacky, but seemingly better than the alternatives
-            ssz::DecodeError::BytesInvalid(message)
-                if message.contains("Blst") || message.contains("Milagro") =>
-            {
+            ssz::DecodeError::BytesInvalid(message) if message.contains("Blst") => {
                 Error::InvalidBLSInput(message)
             }
             e => Error::FailedToParseTest(format!(