chore: ⬆️ upgrade tonic

mdcpp · Dec 7, 2023 · 76e811a · 76e811a
1 parent 47acf86
commit 76e811a
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 47 deletions.
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -11,9 +11,9 @@ members = ["entity"]
 [dependencies]
 log = "0.4.18"
 paste = "1.0.12"
-prost = "0.11.9"
+prost = "0.12.3"
 toml = "0.7.4"
-prost-types = "0.11.9"
+prost-types = "0.12.3"
 entity = { path = "./entity" }
 chrono = "0.4.26"
 thiserror = "1.0.44"
@@ -24,7 +24,7 @@ futures = "0.3.29"
 bincode = "1.3.3"
 base64 = "0.21.5"
 uuid = "1.5.0"
-tonic-web = "0.9.2"
+tonic-web = "0.10.2"
 quick_cache = "0.4.0"
 leaky-bucket = "1.0.1"
 hickory-resolver = "0.24.0"
@@ -60,15 +60,15 @@ version = "1.0.163"
 features = ["derive"]
 
 [dependencies.tonic]
-version = "0.9.2"
+version = "0.10.2"
 features = ["transport", "channel", "codegen", "tls", "prost"]
 
 [dependencies.spin]
 version = "0.9.8"
 features = ["mutex","spin_mutex","rwlock"]
 
 [build-dependencies]
-tonic-build = "0.9.2"
+tonic-build = "0.10.2"
 
 [features]
 default = ["single-instance"]

diff --git a/backend/src/endpoint/util/pagination.rs b/backend/src/endpoint/util/pagination.rs
@@ -155,8 +155,7 @@ where
                 let sort = match pager.sort {
                     RawSearchDep::Text(x) => SearchDep::Text(x),
                     RawSearchDep::Column(sort_by, reverse) => {
-                        let sort_by = SortBy::from_i32(sort_by)
-                            .ok_or(Error::PaginationError("Pager reconstruction failed"))?;
+                        let sort_by = sort_by.try_into()     .map_err(|_|Error::PaginationError("Pager reconstruction failed"))?;
                         SearchDep::Column(sort_by, reverse)
                     }
                     RawSearchDep::Parent(x) => SearchDep::Parent(x),
@@ -285,8 +284,7 @@ where
                 let sort = match pager.sort {
                     RawSearchDep::Text(x) => SearchDep::Text(x),
                     RawSearchDep::Column(sort_by, reverse) => {
-                        let sort_by = SortBy::from_i32(sort_by)
-                            .ok_or(Error::PaginationError("Pager reconstruction failed"))?;
+                        let sort_by = sort_by.try_into()                          .map_err(|_|Error::PaginationError("Pager reconstruction failed"))?;
                         SearchDep::Column(sort_by, reverse)
                     }
                     RawSearchDep::Parent(_) => {