refactor(builder): split builder sender from server #266
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dancoombs
force-pushed
the
danc/pool-sim-2
branch
3 times, most recently
from
b0dcfe1
to
119566d
Compare
dancoombs
force-pushed
the
danc/builder-server
branch
from
1ce0f80
to
4a7a0d9
Compare
dancoombs
commented
Jul 25, 2023
Comment on lines
+135
to
+146
| let mut send_bundle_response: Option<oneshot::Sender<SendBundleResult>> = None; | ||
|
|
||
| if self.manual_bundling_mode.load(Ordering::Relaxed) { | ||
| tokio::select! { | ||
| Some(r) = self.send_bundle_receiver.recv() => { | ||
| send_bundle_response = Some(r.responder); | ||
| } | ||
| _ = time::sleep(self.eth_poll_interval) => { | ||
| continue; | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Logic change here to get the bundle request async and respond with the tx hash.
dancoombs
commented
Jul 25, 2023
| @@ -0,0 +1,473 @@ | |||
| use std::{ | |||
There was a problem hiding this comment.
This file is mostly copied over, change labled.
dancoombs
commented
Jul 25, 2023
Comment on lines
+52
to
+59
| self.send_bundle_requester | ||
| .send(SendBundleRequest { responder: tx }) | ||
| .await | ||
| .map_err(|e| Status::internal(format!("failed to send bundle request {e}")))?; | ||
|
|
||
| let result = rx | ||
| .await | ||
| .map_err(|e| Status::internal(format!("failed to receive bundle result {e}")))?; |
There was a problem hiding this comment.
Request is now sent over a channel vs a direct future call.
dancoombs
commented
Jul 25, 2023
| /// which has multiple type parameters whose concrete types themselves need type | ||
| /// parameters and is overall extremely nasty to write out. So we make ourselves | ||
| /// a non-instantiatable type that implements `Builder` that we can use instead. | ||
| pub enum DummyBuilder {} |
There was a problem hiding this comment.
Dummy is no longer needed since the type is now simple
|
Diff is mostly due to moving the bundle sending code out of the server and into its own file. Changes are labeled. |
dancoombs
force-pushed
the
danc/pool-sim-2
branch
from
119566d
to
945956b
Compare
dancoombs
force-pushed
the
danc/builder-server
branch
from
4a7a0d9
to
431f84d
Compare
dphilipson
approved these changes
Jul 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactoring in preparation of conditionally spinning up the builder grpc server vs a local "server". The local client would simply hold a copy of the manual bundling bool and the request submitter.