[Merged by Bors] - Use only lighthouse types in the mock builder #4793

realbigsean · 2023-09-28T20:25:58Z

Proposed Changes

only use LH types to avoid build issues
use warp instead of axum for the server to avoid importing the dep

Additional Info

wondering if we can move the execution_layer/test_utils to its own crate and import it as a dev dependency
this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate
or maybe we can look into using reth types for the engine api if they are in their own crate

michaelsproul

Fantastic! Should hopefully make compilation a bit lighter with those deps removed

michaelsproul · 2023-09-29T00:19:37Z

beacon_node/execution_layer/src/test_utils/mock_builder.rs

+impl<E: EthSpec> BidStuff<E> for BuilderBid<E, BlindedPayload<E>> {
+    fn set_fee_recipient(&mut self, fee_recipient: Address) {
+        match self.header.to_mut() {
+            BlindedPayloadRefMut::Merge(payload) => {


Wanted to rewrite this with a mapping macro but realised it isn't possible. Opened an issue on superstruct: sigp/superstruct#31

paulhauner · 2023-09-29T02:39:13Z

bors r+

## Proposed Changes - only use LH types to avoid build issues - use warp instead of axum for the server to avoid importing the dep ## Additional Info - wondering if we can move the `execution_layer/test_utils` to its own crate and import it as a dev dependency - this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate - or maybe we can look into using reth types for the engine api if they are in their own crate Co-authored-by: realbigsean <[email protected]>

bors · 2023-09-29T03:20:12Z

This PR was included in a batch that was canceled, it will be automatically retried

paulhauner · 2023-09-29T03:20:15Z

bors r-

bors · 2023-09-29T03:20:16Z

Canceled.

paulhauner · 2023-09-29T03:20:19Z

bors r+

paulhauner · 2023-09-29T05:55:04Z

bors r-

bors · 2023-09-29T05:55:06Z

Canceled.

paulhauner · 2023-09-29T05:58:02Z

bors r+

## Proposed Changes - only use LH types to avoid build issues - use warp instead of axum for the server to avoid importing the dep ## Additional Info - wondering if we can move the `execution_layer/test_utils` to its own crate and import it as a dev dependency - this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate - or maybe we can look into using reth types for the engine api if they are in their own crate Co-authored-by: realbigsean <[email protected]>

bors · 2023-09-29T06:38:58Z

Build failed (retrying...):

debug-tests-ubuntu

## Proposed Changes - only use LH types to avoid build issues - use warp instead of axum for the server to avoid importing the dep ## Additional Info - wondering if we can move the `execution_layer/test_utils` to its own crate and import it as a dev dependency - this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate - or maybe we can look into using reth types for the engine api if they are in their own crate Co-authored-by: realbigsean <[email protected]>

bors · 2023-09-29T07:30:20Z

Build failed (retrying...):

debug-tests-ubuntu

## Proposed Changes - only use LH types to avoid build issues - use warp instead of axum for the server to avoid importing the dep ## Additional Info - wondering if we can move the `execution_layer/test_utils` to its own crate and import it as a dev dependency - this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate - or maybe we can look into using reth types for the engine api if they are in their own crate Co-authored-by: realbigsean <[email protected]>

bors · 2023-09-29T12:15:56Z

Build failed:

debug-tests-ubuntu

realbigsean · 2023-09-29T13:38:53Z

bors r+

## Proposed Changes - only use LH types to avoid build issues - use warp instead of axum for the server to avoid importing the dep ## Additional Info - wondering if we can move the `execution_layer/test_utils` to its own crate and import it as a dev dependency - this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate - or maybe we can look into using reth types for the engine api if they are in their own crate Co-authored-by: realbigsean <[email protected]>

bors · 2023-09-29T13:57:29Z

Build failed:

debug-tests-ubuntu

jxs

Thanks Sean!

jxs · 2023-09-29T15:26:07Z

beacon_node/beacon_chain/src/test_utils.rs

+    pub fn set_mock_builder(
+        &mut self,
+        beacon_url: SensitiveUrl,
+    ) -> impl std::future::Future<Output = ()> {


nit:

Suggested change

pub fn set_mock_builder(

&mut self,

beacon_url: SensitiveUrl,

) -> impl std::future::Future<Output = ()> {

pub async fn set_mock_builder(&mut self, beacon_url: SensitiveUrl) {

and bellow call mock_builder_server.await

true! updated

impl Future actually implicitly has a 'static lifetime, and switching to async changes this, so had to change it back

jxs · 2023-09-29T15:54:24Z

beacon_node/execution_layer/src/test_utils/mock_builder.rs

@@ -193,7 +180,7 @@ impl<E: EthSpec> MockBuilder<E> {
        beacon_url: SensitiveUrl,
        spec: ChainSpec,
        executor: TaskExecutor,
-    ) -> (Self, MockBuilderServer) {
+    ) -> (Self, (SocketAddr, impl Future<Output = ()>)) {


same as above, we can just:

Suggested change

) -> (Self, (SocketAddr, impl Future<Output = ()>)) {

) -> (Self, SocketAddr) {

if we change the signature of the function to async fn and .await on server

We want to lazily evaluate the server future though, after the socket address has been returned and used by the caller.

Oh yea, this one I think we have to leave

…-types-in-mock-builder

realbigsean · 2023-10-03T12:14:55Z

bors r+

## Proposed Changes - only use LH types to avoid build issues - use warp instead of axum for the server to avoid importing the dep ## Additional Info - wondering if we can move the `execution_layer/test_utils` to its own crate and import it as a dev dependency - this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate - or maybe we can look into using reth types for the engine api if they are in their own crate Co-authored-by: realbigsean <[email protected]>

bors · 2023-10-03T12:21:41Z

Build failed:

cargo-udeps

realbigsean · 2023-10-03T13:27:08Z

bors r+

## Proposed Changes - only use LH types to avoid build issues - use warp instead of axum for the server to avoid importing the dep ## Additional Info - wondering if we can move the `execution_layer/test_utils` to its own crate and import it as a dev dependency - this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate - or maybe we can look into using reth types for the engine api if they are in their own crate Co-authored-by: realbigsean <[email protected]>

bors · 2023-10-03T14:52:39Z

Build failed:

dockerfile-ubuntu
merge-transition-ubuntu
release-tests-ubuntu
state-transition-vectors-ubuntu

realbigsean · 2023-10-03T16:07:48Z

bors retry

## Proposed Changes - only use LH types to avoid build issues - use warp instead of axum for the server to avoid importing the dep ## Additional Info - wondering if we can move the `execution_layer/test_utils` to its own crate and import it as a dev dependency - this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate - or maybe we can look into using reth types for the engine api if they are in their own crate Co-authored-by: realbigsean <[email protected]>

bors · 2023-10-03T16:36:35Z

Build failed:

release-tests-ubuntu

realbigsean · 2023-10-03T16:54:14Z

bors retry

## Proposed Changes - only use LH types to avoid build issues - use warp instead of axum for the server to avoid importing the dep ## Additional Info - wondering if we can move the `execution_layer/test_utils` to its own crate and import it as a dev dependency - this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate - or maybe we can look into using reth types for the engine api if they are in their own crate Co-authored-by: realbigsean <[email protected]>

bors · 2023-10-03T17:07:33Z

Build failed:

release-tests-ubuntu

realbigsean · 2023-10-03T17:14:05Z

bors retry

## Proposed Changes - only use LH types to avoid build issues - use warp instead of axum for the server to avoid importing the dep ## Additional Info - wondering if we can move the `execution_layer/test_utils` to its own crate and import it as a dev dependency - this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate - or maybe we can look into using reth types for the engine api if they are in their own crate Co-authored-by: realbigsean <[email protected]>

bors · 2023-10-03T17:30:55Z

Build failed:

release-tests-windows

realbigsean · 2023-10-03T17:59:10Z

bors retry

## Proposed Changes - only use LH types to avoid build issues - use warp instead of axum for the server to avoid importing the dep ## Additional Info - wondering if we can move the `execution_layer/test_utils` to its own crate and import it as a dev dependency - this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate - or maybe we can look into using reth types for the engine api if they are in their own crate Co-authored-by: realbigsean <[email protected]>

bors · 2023-10-03T18:31:08Z

Pull request successfully merged into unstable.

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

## Proposed Changes - only use LH types to avoid build issues - use warp instead of axum for the server to avoid importing the dep ## Additional Info - wondering if we can move the `execution_layer/test_utils` to its own crate and import it as a dev dependency - this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate - or maybe we can look into using reth types for the engine api if they are in their own crate Co-authored-by: realbigsean <[email protected]>

- only use LH types to avoid build issues - use warp instead of axum for the server to avoid importing the dep - wondering if we can move the `execution_layer/test_utils` to its own crate and import it as a dev dependency - this would be made easier by separating out our engine API types into their own crate so we can use them in the test crate - or maybe we can look into using reth types for the engine api if they are in their own crate Co-authored-by: realbigsean <[email protected]>

realbigsean added 3 commits September 28, 2023 14:54

use only LH types in mock builder

cc480ee

get tests passing

0b24b72

lints

89a2753

realbigsean added the ready-for-review The code is ready for review label Sep 28, 2023

michaelsproul approved these changes Sep 29, 2023

View reviewed changes

michaelsproul added ready-for-merge This PR is ready to merge. v4.6.0 ETA Q1 2024 dependencies Pull requests that update a dependency file and removed ready-for-review The code is ready for review labels Sep 29, 2023

jxs reviewed Sep 29, 2023

View reviewed changes

realbigsean added 2 commits October 3, 2023 08:10

use await in set mock builder

84c8c41

Merge branch 'unstable' of https://github.com/sigp/lighthouse into lh…

c97008d

…-types-in-mock-builder

use await in set mock builder

e7e68e5

revert syntactic sugar

1218a6b

enable tls vendored feature on reqwest

2d600b9

bors bot changed the title ~~Use only lighthouse types in the mock builder~~ [Merged by Bors] - Use only lighthouse types in the mock builder Oct 3, 2023

bors bot closed this Oct 3, 2023

michaelsproul mentioned this pull request Oct 4, 2023

update execution layer dependencies #4784

Closed

realbigsean deleted the lh-types-in-mock-builder branch November 21, 2023 16:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Merged by Bors] - Use only lighthouse types in the mock builder #4793

[Merged by Bors] - Use only lighthouse types in the mock builder #4793

realbigsean commented Sep 28, 2023

michaelsproul left a comment

michaelsproul Sep 29, 2023

paulhauner commented Sep 29, 2023

bors bot commented Sep 29, 2023

paulhauner commented Sep 29, 2023

bors bot commented Sep 29, 2023

paulhauner commented Sep 29, 2023

paulhauner commented Sep 29, 2023

bors bot commented Sep 29, 2023

paulhauner commented Sep 29, 2023

bors bot commented Sep 29, 2023

bors bot commented Sep 29, 2023

bors bot commented Sep 29, 2023

realbigsean commented Sep 29, 2023

bors bot commented Sep 29, 2023

jxs left a comment

jxs Sep 29, 2023

realbigsean Oct 3, 2023

realbigsean Oct 3, 2023

jxs Sep 29, 2023

michaelsproul Oct 2, 2023

realbigsean Oct 3, 2023

realbigsean commented Oct 3, 2023

bors bot commented Oct 3, 2023

realbigsean commented Oct 3, 2023

bors bot commented Oct 3, 2023

realbigsean commented Oct 3, 2023

bors bot commented Oct 3, 2023

realbigsean commented Oct 3, 2023

bors bot commented Oct 3, 2023

realbigsean commented Oct 3, 2023

bors bot commented Oct 3, 2023

realbigsean commented Oct 3, 2023

bors bot commented Oct 3, 2023

	) -> (Self, (SocketAddr, impl Future<Output = ()>)) {
	) -> (Self, SocketAddr) {

[Merged by Bors] - Use only lighthouse types in the mock builder #4793

[Merged by Bors] - Use only lighthouse types in the mock builder #4793

Conversation

realbigsean commented Sep 28, 2023

Proposed Changes

Additional Info

michaelsproul left a comment

Choose a reason for hiding this comment

michaelsproul Sep 29, 2023

Choose a reason for hiding this comment

paulhauner commented Sep 29, 2023

bors bot commented Sep 29, 2023

paulhauner commented Sep 29, 2023

bors bot commented Sep 29, 2023

paulhauner commented Sep 29, 2023

paulhauner commented Sep 29, 2023

bors bot commented Sep 29, 2023

paulhauner commented Sep 29, 2023

bors bot commented Sep 29, 2023

bors bot commented Sep 29, 2023

bors bot commented Sep 29, 2023

realbigsean commented Sep 29, 2023

bors bot commented Sep 29, 2023

jxs left a comment

Choose a reason for hiding this comment

jxs Sep 29, 2023

Choose a reason for hiding this comment

realbigsean Oct 3, 2023

Choose a reason for hiding this comment

realbigsean Oct 3, 2023

Choose a reason for hiding this comment

jxs Sep 29, 2023

Choose a reason for hiding this comment

michaelsproul Oct 2, 2023

Choose a reason for hiding this comment

realbigsean Oct 3, 2023

Choose a reason for hiding this comment

realbigsean commented Oct 3, 2023

bors bot commented Oct 3, 2023

realbigsean commented Oct 3, 2023

bors bot commented Oct 3, 2023

realbigsean commented Oct 3, 2023

bors bot commented Oct 3, 2023

realbigsean commented Oct 3, 2023

bors bot commented Oct 3, 2023

realbigsean commented Oct 3, 2023

bors bot commented Oct 3, 2023

realbigsean commented Oct 3, 2023

bors bot commented Oct 3, 2023