commit 919e5c36be6500e8b128904c8575777a727c68f0
author Ben <benlawson@google.com> Thu Sep 14 20:56:28 2023 +0000
committer Rob Mohr <mohrr@google.com> Thu Nov 16 10:59:42 2023 -0800
tree 252dcf0dda1bf0368bfeba3be2845e3d6c77988d
parent 8709954fb165cf67ca21aab1584167b0c6bfa3c8

[bt][att] Finish migrating att::kTransactionTimeout to pw_chrono

Bug: 100594
Test: fx test bt-host-att-tests
Change-Id: Iafb625308e6949a02aa85e5fa2562b0cb0f1351f
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/917012
Fuchsia-Auto-Submit: Ben Lawson <benlawson@google.com>
Reviewed-by: Ali Saeed <saeedali@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>

pw_bluetooth_sapphire/host/att/att.h

diff --git a/pw_bluetooth_sapphire/host/att/att.h b/pw_bluetooth_sapphire/host/att/att.h
index e1b5802..7540dc8 100644
--- a/pw_bluetooth_sapphire/host/att/att.h
+++ b/pw_bluetooth_sapphire/host/att/att.h
@@ -9,7 +9,6 @@
 #include <cstdint>
 #include <type_traits>
 
-#include "lib/zx/time.h"
 #include "src/connectivity/bluetooth/core/bt-host/common/macros.h"
 #include "src/connectivity/bluetooth/core/bt-host/common/uint128.h"
 #include "src/connectivity/bluetooth/core/bt-host/hci-spec/constants.h"
@@ -30,8 +29,7 @@
 
 // The ATT protocol transaction timeout.
 // (see v5.0, Vol 3, Part F, Section 3.3.3).
-constexpr zx::duration kTransactionTimeout = zx::sec(30);
-constexpr pw::chrono::SystemClock::duration kPwTransactionTimeout = std::chrono::seconds(30);
+constexpr pw::chrono::SystemClock::duration kTransactionTimeout = std::chrono::seconds(30);
 
 // A server identifies each attribute using a 16-bit handle.
 using Handle = uint16_t;

pw_bluetooth_sapphire/host/att/bearer.cc

diff --git a/pw_bluetooth_sapphire/host/att/bearer.cc b/pw_bluetooth_sapphire/host/att/bearer.cc
index 3fd2467..7a60bfd 100644
--- a/pw_bluetooth_sapphire/host/att/bearer.cc
+++ b/pw_bluetooth_sapphire/host/att/bearer.cc
@@ -511,7 +511,7 @@
           ShutDownInternal(/*due_to_timeout=*/true);
         }
       },
-      kPwTransactionTimeout);
+      kTransactionTimeout);
 }
 
 void Bearer::SendErrorResponse(OpCode request_opcode, Handle attribute_handle,

pw_bluetooth_sapphire/host/att/bearer_unittest.cc

diff --git a/pw_bluetooth_sapphire/host/att/bearer_unittest.cc b/pw_bluetooth_sapphire/host/att/bearer_unittest.cc
index e5c495e..1a32378 100644
--- a/pw_bluetooth_sapphire/host/att/bearer_unittest.cc
+++ b/pw_bluetooth_sapphire/host/att/bearer_unittest.cc
@@ -140,7 +140,7 @@
   EXPECT_PACKET_OUT(*request);
   bearer()->StartTransaction(std::move(request), cb);
 
-  RunFor(kPwTransactionTimeout);
+  RunFor(kTransactionTimeout);
 
   EXPECT_TRUE(closed);
   EXPECT_TRUE(err_cb_called);
@@ -186,7 +186,7 @@
   EXPECT_EQ(0u, err_cb_count);
 
   // Make the request timeout.
-  RunFor(kPwTransactionTimeout);
+  RunFor(kTransactionTimeout);
 
   EXPECT_TRUE(closed);
   EXPECT_EQ(kTransactionCount, err_cb_count);
@@ -214,7 +214,7 @@
   EXPECT_PACKET_OUT(*request);
   bearer()->StartTransaction(std::move(request), cb);
 
-  RunFor(kPwTransactionTimeout);
+  RunFor(kTransactionTimeout);
 
   EXPECT_TRUE(closed);
   EXPECT_TRUE(err_cb_called);
@@ -262,7 +262,7 @@
   EXPECT_EQ(0u, err_cb_count);
 
   // Make the request timeout.
-  RunFor(kPwTransactionTimeout);
+  RunFor(kTransactionTimeout);
 
   EXPECT_TRUE(closed);
   EXPECT_EQ(kTransactionCount, err_cb_count);