Skip to content

chore(test): replaced httpmock by (already used) wiremock #3342

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

Draft
vbar wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

chore(test): replaced httpmock by (already used) wiremock #3342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a988b2
chore(test): replaced httpmock by (already used) wiremock
vbar Apr 15, 2026
6a1e0d9
chore(test): remove dependency on gateway-test-utils
vbar Apr 15, 2026
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
131 changes: 2 additions & 129 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ members = [
"crates/gas-price",
"crates/gateway-client",
"crates/gateway-test-fixtures",
"crates/gateway-test-utils",
"crates/gateway-types",
"crates/merkle-tree",
"crates/p2p",
Expand Down Expand Up @@ -82,7 +81,6 @@ governor = "0.10.4"
hex = "0.4.3"
http = "1.4.0"
http-body = "1.0.1"
httpmock = "0.8.3"
hyper = "1.8.1"
ipnet = "2.12.0"
jemallocator = "0.5.4"
Expand Down Expand Up @@ -152,6 +150,7 @@ url = "2.5.8"
vergen = { version = "8", default-features = false }
void = "1.0.2"
warp = "0.3.7"
wiremock = "0.6.5"
zeroize = "1.8.2"
zstd = "0.13.3"

Expand Down
4 changes: 1 addition & 3 deletions crates/gateway-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ tracing = { workspace = true }
assert_matches = { workspace = true }
base64 = { workspace = true }
fake = { workspace = true }
gateway-test-utils = { path = "../gateway-test-utils" }
httpmock = { workspace = true }
pathfinder-crypto = { path = "../crypto" }
pretty_assertions_sorted = { workspace = true }
reqwest = { workspace = true, features = ["json"] }
Expand All @@ -42,7 +40,7 @@ test-log = { workspace = true, features = ["trace"] }
tracing-subscriber = { workspace = true }
warp = { workspace = true, features = ["compression-gzip"] }
# Because httpmock doesn't support byte-matching on response body
wiremock = "0.6.5"
wiremock = { workspace = true }

[[test]]
name = "integration-metrics"
Expand Down
40 changes: 20 additions & 20 deletions crates/gateway-client/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,31 +732,28 @@ mod tests {

mod api_key_is_set_when_configured {
use fake::{Fake, Faker};
use httpmock::prelude::*;
use httpmock::Mock;
use serde_json::json;
use wiremock::{matchers, Mock, MockServer, ResponseTemplate};

use crate::Client;

async fn setup_with_fake_api_key(server: &MockServer) -> (Mock<'_>, Client) {
async fn setup_with_fake_api_key(server: &MockServer) -> Client {
let api_key = Faker.fake::<String>();

let mock = server.mock(|when, then| {
when.any_request().header("X-Throttling-Bypass", &api_key);
then.status(200).json_body(json!({}));
});
Mock::given(matchers::header("X-Throttling-Bypass", &api_key))
.respond_with(ResponseTemplate::new(200).set_body_json(json!({})))
.mount(server)
.await;

let client = Client::for_test(server.base_url().parse().unwrap())
Client::for_test(server.uri().parse().unwrap())
.unwrap()
.with_api_key(Some(api_key.clone()));

(mock, client)
.with_api_key(Some(api_key))
}

#[tokio::test]
async fn get() -> anyhow::Result<()> {
let server = MockServer::start_async().await;
let (mock, client) = setup_with_fake_api_key(&server).await;
let server = MockServer::start().await;
let client = setup_with_fake_api_key(&server).await;

let _: serde_json::Value = client
.clone()
Expand All @@ -774,15 +771,16 @@ mod tests {
.get()
.await?;

mock.assert_calls(2);
let requests = server.received_requests().await.unwrap();
assert_eq!(requests.len(), 2);

Ok(())
}

#[tokio::test]
async fn get_as_bytes() -> anyhow::Result<()> {
let server = MockServer::start_async().await;
let (mock, client) = setup_with_fake_api_key(&server).await;
let server = MockServer::start().await;
let client = setup_with_fake_api_key(&server).await;

let _: bytes::Bytes = client
.clone()
Expand All @@ -800,15 +798,16 @@ mod tests {
.get_as_bytes()
.await?;

mock.assert_calls(2);
let requests = server.received_requests().await.unwrap();
assert_eq!(requests.len(), 2);

Ok(())
}

#[tokio::test]
async fn post_with_json() -> anyhow::Result<()> {
let server = MockServer::start_async().await;
let (mock, client) = setup_with_fake_api_key(&server).await;
let server = MockServer::start().await;
let client = setup_with_fake_api_key(&server).await;

let _: serde_json::Value = client
.clone()
Expand All @@ -826,7 +825,8 @@ mod tests {
.post_with_json(&json!({}), None)
.await?;

mock.assert_calls(2);
let requests = server.received_requests().await.unwrap();
assert_eq!(requests.len(), 2);

Ok(())
}
Expand Down
Loading
Loading