Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: share HTTP client between DeploymentClients #87

Merged
merged 1 commit into from
Nov 8, 2023
Merged

fix: share HTTP client between DeploymentClients #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions common/src/allocations/monitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,15 +203,15 @@ mod test {
// Set up a mock network subgraph
let mock_server = MockServer::start().await;
let network_subgraph = SubgraphClient::new(
reqwest::Client::new(),
None,
DeploymentDetails::for_query_url(&format!(
"{}/subgraphs/id/{}",
&mock_server.uri(),
*test_vectors::NETWORK_SUBGRAPH_DEPLOYMENT
))
.unwrap(),
)
.unwrap();
);

// Mock result for current epoch requests
mock_server
Expand Down
4 changes: 2 additions & 2 deletions common/src/attestations/dispute_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ mod test {
// Set up a mock network subgraph
let mock_server = MockServer::start().await;
let network_subgraph = SubgraphClient::new(
reqwest::Client::new(),
None,
DeploymentDetails::for_query_url(&format!(
"{}/subgraphs/id/{}",
&mock_server.uri(),
*test_vectors::NETWORK_SUBGRAPH_DEPLOYMENT
))
.unwrap(),
)
.unwrap();
);

// Mock result for current epoch requests
mock_server
Expand Down
20 changes: 9 additions & 11 deletions common/src/escrow_accounts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,18 +127,16 @@ mod tests {
async fn test_current_accounts() {
// Set up a mock escrow subgraph
let mock_server = MockServer::start().await;
let escrow_subgraph = Box::leak(Box::new(
SubgraphClient::new(
None,
DeploymentDetails::for_query_url(&format!(
"{}/subgraphs/id/{}",
&mock_server.uri(),
*test_vectors::ESCROW_SUBGRAPH_DEPLOYMENT
))
.unwrap(),
)
let escrow_subgraph = Box::leak(Box::new(SubgraphClient::new(
reqwest::Client::new(),
None,
DeploymentDetails::for_query_url(&format!(
"{}/subgraphs/id/{}",
&mock_server.uri(),
*test_vectors::ESCROW_SUBGRAPH_DEPLOYMENT
))
.unwrap(),
));
)));

let mock = Mock::given(method("POST"))
.and(path(format!(
Expand Down
35 changes: 18 additions & 17 deletions common/src/subgraph_client/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,15 @@ impl DeploymentDetails {
}

struct DeploymentClient {
pub http_client: reqwest::Client,
pub status: Option<Eventual<DeploymentStatus>>,
pub query_url: Url,
}

impl DeploymentClient {
pub fn new(details: DeploymentDetails) -> Self {
pub fn new(http_client: reqwest::Client, details: DeploymentDetails) -> Self {
Self {
http_client,
status: details
.deployment
.zip(details.status_url)
Expand All @@ -71,7 +73,8 @@ impl DeploymentClient {
}
}

Ok(reqwest::Client::new()
Ok(self
.http_client
.post(self.query_url.as_ref())
.json(body)
.header(header::USER_AGENT, "indexer-common")
Expand All @@ -92,16 +95,14 @@ pub struct SubgraphClient {

impl SubgraphClient {
pub fn new(
http_client: reqwest::Client,
local_deployment: Option<DeploymentDetails>,
remote_deployment: DeploymentDetails,
) -> Result<Self, anyhow::Error> {
let local_client = local_deployment.map(DeploymentClient::new);
let remote_client = DeploymentClient::new(remote_deployment);

Ok(Self {
local_client,
remote_client,
})
) -> Self {
Self {
local_client: local_deployment.map(|d| DeploymentClient::new(http_client.clone(), d)),
remote_client: DeploymentClient::new(http_client, remote_deployment),
}
}

pub async fn query<T: for<'de> Deserialize<'de>>(
Expand Down Expand Up @@ -173,10 +174,10 @@ mod test {

fn network_subgraph_client() -> SubgraphClient {
SubgraphClient::new(
reqwest::Client::new(),
None,
DeploymentDetails::for_query_url(NETWORK_SUBGRAPH_URL).unwrap(),
)
.unwrap()
}

#[tokio::test]
Expand Down Expand Up @@ -253,15 +254,15 @@ mod test {

// Create the subgraph client
let client = SubgraphClient::new(
reqwest::Client::new(),
Some(DeploymentDetails::for_graph_node(&mock_server_local.uri(), deployment).unwrap()),
DeploymentDetails::for_query_url(&format!(
"{}/subgraphs/id/{}",
mock_server_remote.uri(),
deployment
))
.unwrap(),
)
.unwrap();
);

// Query the subgraph
let response: Response<Value> = client
Expand Down Expand Up @@ -325,15 +326,15 @@ mod test {

// Create the subgraph client
let client = SubgraphClient::new(
reqwest::Client::new(),
Some(DeploymentDetails::for_graph_node(&mock_server_local.uri(), deployment).unwrap()),
DeploymentDetails::for_query_url(&format!(
"{}/subgraphs/id/{}",
mock_server_remote.uri(),
deployment
))
.unwrap(),
)
.unwrap();
);

// Query the subgraph
let response: Response<Value> = client
Expand Down Expand Up @@ -397,15 +398,15 @@ mod test {

// Create the subgraph client
let client = SubgraphClient::new(
reqwest::Client::new(),
Some(DeploymentDetails::for_graph_node(&mock_server_local.uri(), deployment).unwrap()),
DeploymentDetails::for_query_url(&format!(
"{}/subgraphs/id/{}",
mock_server_remote.uri(),
deployment
))
.unwrap(),
)
.unwrap();
);

// Query the subgraph
let response: Response<Value> = client
Expand Down
76 changes: 38 additions & 38 deletions service/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ async fn main() -> Result<(), std::io::Error> {
&config.indexer_infrastructure.graph_node_query_endpoint,
);

let http_client = reqwest::Client::builder()
.tcp_nodelay(true)
.timeout(Duration::from_secs(30))
.build()
.expect("Failed to init HTTP client");

// Make an instance of network subgraph at either
// graph_node_query_endpoint/subgraphs/id/network_subgraph_deployment
// or network_subgraph_endpoint
Expand All @@ -69,26 +75,22 @@ async fn main() -> Result<(), std::io::Error> {
// a static lifetime, which avoids having to pass around and clone `Arc`
// objects everywhere. Since the network subgraph is read-only, this is
// no problem.
let network_subgraph = Box::leak(Box::new(
SubgraphClient::new(
config
.network_subgraph
.network_subgraph_deployment
.map(|deployment| {
DeploymentDetails::for_graph_node(
&config.indexer_infrastructure.graph_node_query_endpoint,
deployment,
)
})
.transpose()
.expect(
"Failed to parse graph node query endpoint and network subgraph deployment",
),
DeploymentDetails::for_query_url(&config.network_subgraph.network_subgraph_endpoint)
.expect("Failed to parse network subgraph endpoint"),
)
.expect("Failed to set up network subgraph client"),
));
let network_subgraph = Box::leak(Box::new(SubgraphClient::new(
http_client.clone(),
config
.network_subgraph
.network_subgraph_deployment
.map(|deployment| {
DeploymentDetails::for_graph_node(
&config.indexer_infrastructure.graph_node_query_endpoint,
deployment,
)
})
.transpose()
.expect("Failed to parse graph node query endpoint and network subgraph deployment"),
DeploymentDetails::for_query_url(&config.network_subgraph.network_subgraph_endpoint)
.expect("Failed to parse network subgraph endpoint"),
)));

let indexer_allocations = indexer_allocations(
network_subgraph,
Expand Down Expand Up @@ -119,24 +121,22 @@ async fn main() -> Result<(), std::io::Error> {
// assume the models are up to date in the service.
let indexer_management_db = database::connect(&config.postgres).await;

let escrow_subgraph = Box::leak(Box::new(
SubgraphClient::new(
config
.escrow_subgraph
.escrow_subgraph_deployment
.map(|deployment| {
DeploymentDetails::for_graph_node(
&config.indexer_infrastructure.graph_node_query_endpoint,
deployment,
)
})
.transpose()
.expect("Failed to parse graph node query endpoint and escrow subgraph deployment"),
DeploymentDetails::for_query_url(&config.escrow_subgraph.escrow_subgraph_endpoint)
.expect("Failed to parse escrow subgraph endpoint"),
)
.expect("Failed to set up escrow subgraph client"),
));
let escrow_subgraph = Box::leak(Box::new(SubgraphClient::new(
http_client,
config
.escrow_subgraph
.escrow_subgraph_deployment
.map(|deployment| {
DeploymentDetails::for_graph_node(
&config.indexer_infrastructure.graph_node_query_endpoint,
deployment,
)
})
.transpose()
.expect("Failed to parse graph node query endpoint and escrow subgraph deployment"),
DeploymentDetails::for_query_url(&config.escrow_subgraph.escrow_subgraph_endpoint)
.expect("Failed to parse escrow subgraph endpoint"),
)));

let escrow_accounts = escrow_accounts(
escrow_subgraph,
Expand Down