changed uuid to method

nrf-softdevice/src/ble/gatt_client.rs

@@ -55,10 +55,10 @@ pub trait Client {
 
     /// Get the UUID of the GATT service. This is used by [`discover`] to search for the
     /// service in the GATT server.
-    fn uuid() -> Uuid;
+    fn uuid(&self) -> Uuid;
 
     /// Create a new instance in a "not-yet-discovered" state.
-    fn new_undiscovered(conn: Connection) -> Self;
+    fn new_undiscovered(uuid: Uuid, conn: Connection) -> Self;
 
     /// Called by [`discover`] for every discovered characteristic. Implementations must
     /// check if they're interested in the UUID of the characteristic, and save their
@@ -275,16 +275,16 @@ async fn discover_inner<T: Client>(
 
 /// Discover a service in the peer's GATT server and construct a Client instance
 /// to use it.
-pub async fn discover<T: Client>(conn: &Connection) -> Result<T, DiscoverError> {
+pub async fn discover<T: Client>(uuid: &Uuid, conn: &Connection) -> Result<T, DiscoverError> {
     // TODO handle drop. Probably doable gracefully (no DropBomb)
 
-    let svc = match discover_service(conn, T::uuid()).await {
+    let mut client = T::new_undiscovered(uuid.clone(), conn.clone());
+
+    let svc = match discover_service(conn, client.uuid()).await {
         Err(DiscoverError::Gatt(GattError::ATTERR_ATTRIBUTE_NOT_FOUND)) => Err(DiscoverError::ServiceNotFound),
         x => x,
     }?;
 
-    let mut client = T::new_undiscovered(conn.clone());
-
     let mut curr_handle = svc.handle_range.start_handle;
     let end_handle = svc.handle_range.end_handle;