Fix errors after rebase

Author: paulhauner

beacon_node/beacon_chain/tests/payload_invalidation.rs

@@ -89,7 +89,7 @@ impl InvalidPayloadRig {
                 } else {
                     mock_execution_layer.server.full_payload_verification();
                 }
-                self.harness.process_block(slot, block.clone()).unwrap();
+                self.harness.process_block(slot, block).unwrap();
                 self.valid_blocks.insert(block_root);
                 // TODO: check syncing blocks are optimistic.
             }
@@ -101,7 +101,7 @@ impl InvalidPayloadRig {
                     .server
                     .all_payloads_invalid(latest_valid_hash);
 
-                match self.harness.process_block(slot, block.clone()) {
+                match self.harness.process_block(slot, block) {
                     Err(BlockError::ExecutionPayloadError(
                         ExecutionPayloadError::RejectedByExecutionEngine,
                     )) => (),

beacon_node/execution_layer/src/test_utils/handle_rpc.rs

@@ -75,7 +75,7 @@ pub async fn handle_rpc<T: EthSpec>(
                 }
                 FixedPayloadResponse::Invalid { latest_valid_hash } => ExecutePayloadResponse {
                     status: ExecutePayloadResponseStatus::Invalid { latest_valid_hash },
-                    message: None,
+                    validation_error: None,
                 },
                 FixedPayloadResponse::Syncing => {
                     // Try to import the block, ignore the response.
@@ -84,7 +84,7 @@ pub async fn handle_rpc<T: EthSpec>(
                         .execute_payload(request.into());
                     ExecutePayloadResponse {
                         status: ExecutePayloadResponseStatus::Syncing,
-                        message: None,
+                        validation_error: None,
                     }
                 }
             };