merge with upstream

testing/ef_tests/tests/tests.rs

@@ -532,6 +532,11 @@ fn genesis_validity() {
     // Note: there are no genesis validity tests for mainnet
 }
 
+#[test]
+fn merkle_proof_validity() {
+    MerkleProofValidityHandler::<MainnetEthSpec>::default().run();
+}
+
 #[test]
 fn rewards() {
     for handler in &["basic", "leak", "random"] {