use i64 for lease ttl and LeaseId type for ttl request (#81)

zarvd · Nov 16, 2022 · 0d233fc · 0d233fc
1 parent e5e1158
commit 0d233fc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/src/lease/grant.rs b/src/lease/grant.rs
@@ -43,15 +43,15 @@ impl From<Duration> for LeaseGrantRequest {
 pub struct LeaseGrantResponse {
     pub header: ResponseHeader,
     pub id: LeaseId,
-    pub ttl: u64,
+    pub ttl: i64,
 }
 
 impl From<crate::proto::etcdserverpb::LeaseGrantResponse> for LeaseGrantResponse {
     fn from(proto: crate::proto::etcdserverpb::LeaseGrantResponse) -> Self {
         Self {
             header: From::from(proto.header.expect("must fetch header")),
             id: proto.id,
-            ttl: proto.ttl as u64,
+            ttl: proto.ttl,
         }
     }
 }
diff --git a/src/lease/keep_alive.rs b/src/lease/keep_alive.rs
@@ -11,7 +11,7 @@ impl LeaseKeepAliveRequest {
     /// Creates a new LeaseKeepAliveRequest which will refresh the specified lease.
     pub fn new(id: LeaseId) -> Self {
         Self {
-            proto: etcdserverpb::LeaseKeepAliveRequest { id: id as i64 },
+            proto: etcdserverpb::LeaseKeepAliveRequest { id },
         }
     }
 }
@@ -26,15 +26,15 @@ impl From<LeaseKeepAliveRequest> for crate::proto::etcdserverpb::LeaseKeepAliveR
 pub struct LeaseKeepAliveResponse {
     pub header: ResponseHeader,
     pub id: LeaseId,
-    pub ttl: u64,
+    pub ttl: i64,
 }
 
 impl From<crate::proto::etcdserverpb::LeaseKeepAliveResponse> for LeaseKeepAliveResponse {
     fn from(proto: crate::proto::etcdserverpb::LeaseKeepAliveResponse) -> Self {
         Self {
             header: From::from(proto.header.expect("must fetch header")),
             id: proto.id,
-            ttl: proto.ttl as u64,
+            ttl: proto.ttl,
         }
     }
 }
diff --git a/src/lease/time_to_live.rs b/src/lease/time_to_live.rs
@@ -7,19 +7,16 @@ pub struct LeaseTimeToLiveRequest {
 }
 
 impl LeaseTimeToLiveRequest {
-    /// Creates a new LeaseGrantRequest with the specified TTL.
-    pub fn new(id: u64) -> Self {
+    /// Creates a new LeaseTimeToLiveRequest with the specified lease id.
+    pub fn new(id: LeaseId) -> Self {
         Self {
-            proto: etcdserverpb::LeaseTimeToLiveRequest {
-                id: id as i64,
-                keys: false,
-            },
+            proto: etcdserverpb::LeaseTimeToLiveRequest { id, keys: false },
         }
     }
 
     /// Set custom lease ID.
     pub fn with_id(mut self, id: LeaseId) -> Self {
-        self.proto.id = id as i64;
+        self.proto.id = id;
         self
     }
 
@@ -35,25 +32,25 @@ impl From<LeaseTimeToLiveRequest> for crate::proto::etcdserverpb::LeaseTimeToLiv
     }
 }
 
-impl From<u64> for LeaseTimeToLiveRequest {
-    fn from(watch_id: u64) -> Self {
-        Self::new(watch_id)
+impl From<LeaseId> for LeaseTimeToLiveRequest {
+    fn from(lease_id: LeaseId) -> Self {
+        Self::new(lease_id)
     }
 }
 
 #[derive(Debug)]
 pub struct LeaseTimeToLiveResponse {
     pub header: ResponseHeader,
     pub id: LeaseId,
-    pub ttl: u64,
+    pub ttl: i64,
 }
 
 impl From<crate::proto::etcdserverpb::LeaseTimeToLiveResponse> for LeaseTimeToLiveResponse {
     fn from(proto: crate::proto::etcdserverpb::LeaseTimeToLiveResponse) -> Self {
         Self {
             header: From::from(proto.header.expect("must fetch header")),
             id: proto.id,
-            ttl: proto.ttl as u64,
+            ttl: proto.ttl,
         }
     }
 }