simplified more

Author: suzmue

src/integration-tests/src/pubsub.rs

@@ -17,7 +17,7 @@ use rand::{Rng, distr::Alphanumeric};
 
 use crate::Result;
 
-pub async fn basic_topic(builder: pubsub::builder::topic_admin::ClientBuilder) -> Result<()> {
+pub async fn basic_topic() -> Result<()> {
     // Enable a basic subscriber. Useful to troubleshoot problems and visually
     // verify tracing is doing something.
     #[cfg(feature = "log-integration-tests")]
@@ -33,8 +33,7 @@ pub async fn basic_topic(builder: pubsub::builder::topic_admin::ClientBuilder) -
     };
 
     let project = crate::project_id()?;
-    let client = builder.build().await?;
-    let (topic_admin, topic) = create_test_topic().await?;
+    let (client, topic) = create_test_topic().await?;
 
     tracing::info!("testing list_topics()");
     let topics = client
@@ -45,7 +44,7 @@ pub async fn basic_topic(builder: pubsub::builder::topic_admin::ClientBuilder) -
     tracing::info!("success with list_topics={topics:?}");
     assert!(topics.topics.iter().any(|x| x.name == topic.name));
 
-    cleanup_test_topic(topic_admin, topic.name).await?;
+    cleanup_test_topic(client, topic.name).await?;
 
     Ok(())
 }

src/integration-tests/tests/driver.rs

@@ -49,11 +49,9 @@ mod driver {
 
     #[tokio::test(flavor = "multi_thread", worker_threads = 1)]
     async fn run_pubsub_basic_topic() -> integration_tests::Result<()> {
-        integration_tests::pubsub::basic_topic(
-            pubsub::client::TopicAdmin::builder().with_retry_policy(retry_policy()),
-        )
-        .await
-        .map_err(integration_tests::report_error)
+        integration_tests::pubsub::basic_topic()
+            .await
+            .map_err(integration_tests::report_error)
     }
 
     #[test_case(sm::client::SecretManagerService::builder(); "default")]