Remove the TwirpClient trait

tclem · tclem · commit 4567829102fa · 2023-07-17T17:55:32.000-07:00
diff --git a/crates/twirp-build/src/lib.rs b/crates/twirp-build/src/lib.rs
@@ -108,11 +108,7 @@ where
                 service_fqn, m.proto_name,
             )
             .unwrap();
-            writeln!(
-                buf,
-                "    twirp::client::TwirpClient::request(self, url, req).await",
-            )
-            .unwrap();
+            writeln!(buf, "    self.request(url, req).await",).unwrap();
             writeln!(buf, "    }}").unwrap();
         }
         writeln!(buf, "}}").unwrap();
diff --git a/crates/twirp/src/client.rs b/crates/twirp/src/client.rs
@@ -102,18 +102,6 @@ impl std::fmt::Debug for HttpTwirpClient {
     }
 }
 
-#[async_trait]
-pub trait TwirpClient {
-    fn with<M>(&self, middleware: M) -> Self
-    where
-        M: Middleware;
-
-    async fn request<I, O>(&self, url: Url, body: I) -> Result<O>
-    where
-        I: prost::Message,
-        O: prost::Message + Default;
-}
-
 impl HttpTwirpClient {
     /// Creates a TwirpClient with the default `reqwest::ClientBuilder`.
     ///
@@ -145,11 +133,9 @@ impl HttpTwirpClient {
             middlewares,
         })
     }
-}
 
-#[async_trait]
-impl TwirpClient for HttpTwirpClient {
-    fn with<M>(&self, middleware: M) -> Self
+    /// Add some middleware to the request stack.
+    pub fn with<M>(&self, middleware: M) -> Self
     where
         M: Middleware,
     {
@@ -162,7 +148,7 @@ impl TwirpClient for HttpTwirpClient {
         }
     }
 
-    async fn request<I, O>(&self, url: Url, body: I) -> Result<O>
+    pub async fn request<I, O>(&self, url: Url, body: I) -> Result<O>
     where
         I: prost::Message,
         O: prost::Message + Default,
diff --git a/crates/twirp/src/test.rs b/crates/twirp/src/test.rs
@@ -105,7 +105,7 @@ pub trait TestAPIClient {
 impl TestAPIClient for HttpTwirpClient {
     async fn ping(&self, req: PingRequest) -> Result<PingResponse, TwirpClientError> {
         let url = self.base_url.join("test.TestAPI/Ping")?;
-        client::TwirpClient::request(self, url, req).await
+        self.request(url, req).await
     }
 
     async fn boom(&self, _req: PingRequest) -> Result<PingResponse, TwirpClientError> {
diff --git a/example/src/bin/example-client.rs b/example/src/bin/example-client.rs
@@ -1,5 +1,5 @@
 use async_trait::async_trait;
-use twirp::client::{HttpTwirpClient, Middleware, Next, TwirpClient, TwirpClientBuilder};
+use twirp::client::{HttpTwirpClient, Middleware, Next, TwirpClientBuilder};
 use twirp::reqwest::{Request, Response};
 use twirp::url::Url;
 use twirp::GenericError;
@@ -12,7 +12,7 @@ pub mod service {
     }
 }
 
-use service::haberdash::v1::MakeHatRequest;
+use service::haberdash::v1::{HaberdasherAPIClient, MakeHatRequest, MakeHatResponse};
 
 #[tokio::main]
 pub async fn main() -> Result<(), GenericError> {
@@ -65,3 +65,16 @@ impl Middleware for RequestHeaders {
         next.run(req).await
     }
 }
+
+#[derive(Debug)]
+struct MockHaberdasherAPIClient;
+
+#[async_trait]
+impl HaberdasherAPIClient for MockHaberdasherAPIClient {
+    async fn make_hat(
+        &self,
+        _req: MakeHatRequest,
+    ) -> Result<MakeHatResponse, twirp::client::TwirpClientError> {
+        todo!()
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -108,11 +108,7 @@ where`
`108`	`108`	`service_fqn, m.proto_name,`
`109`	`109`	`)`
`110`	`110`	`.unwrap();`
`111`		`- writeln!(`
`112`		`- buf,`
`113`		`- " twirp::client::TwirpClient::request(self, url, req).await",`
`114`		`- )`
`115`		`- .unwrap();`
	`111`	`+ writeln!(buf, " self.request(url, req).await",).unwrap();`
`116`	`112`	`writeln!(buf, " }}").unwrap();`
`117`	`113`	`}`
`118`	`114`	`writeln!(buf, "}}").unwrap();`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ pub trait TestAPIClient {`
`105`	`105`	`impl TestAPIClient for HttpTwirpClient {`
`106`	`106`	`async fn ping(&self, req: PingRequest) -> Result<PingResponse, TwirpClientError> {`
`107`	`107`	`let url = self.base_url.join("test.TestAPI/Ping")?;`
`108`		`- client::TwirpClient::request(self, url, req).await`
	`108`	`+ self.request(url, req).await`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`async fn boom(&self, _req: PingRequest) -> Result<PingResponse, TwirpClientError> {`