Chore/2410 update (#1618)

* chore: Update pyo3 Closes: #1617 --------- Co-authored-by: Philip Jenvey <[email protected]>
mozilla-services · Dec 4, 2024 · 70f101f · 70f101f
1 parent 8363f82
commit 70f101f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/syncstorage-db-common/src/util.rs b/syncstorage-db-common/src/util.rs
@@ -1,4 +1,4 @@
-use std::{convert::TryInto, u64};
+use std::convert::TryInto;
 
 use chrono::{
     offset::{FixedOffset, TimeZone, Utc},

diff --git a/syncstorage-spanner/src/models.rs b/syncstorage-spanner/src/models.rs
@@ -1292,11 +1292,7 @@ impl SpannerDb {
             // most databases) so we specify a max value with offset subtracted
             // to avoid overflow errors (that only occur w/ a FORCE_INDEX=
             // directive) OutOfRange: 400 int64 overflow: <INT64_MAX> + offset
-            query = format!(
-                "{} LIMIT {}",
-                query,
-                i64::max_value() - offset.offset as i64
-            );
+            query = format!("{} LIMIT {}", query, i64::MAX - offset.offset as i64);
         };
 
         if let Some(offset) = params.offset {

diff --git a/tokenserver-auth/Cargo.toml b/tokenserver-auth/Cargo.toml
@@ -28,7 +28,7 @@ syncserver-common = { path = "../syncserver-common" }
 tokenserver-common = { path = "../tokenserver-common" }
 tokenserver-settings = { path = "../tokenserver-settings" }
 tokio = { workspace = true }
-pyo3 = { version = "0.21", features = ["auto-initialize"], optional = true }
+pyo3 = { version = "0.22", features = ["auto-initialize"], optional = true }
 
 
 [dev-dependencies]

diff --git a/tokenserver-auth/src/oauth/py.rs b/tokenserver-auth/src/oauth/py.rs
@@ -19,9 +19,8 @@ use std::{sync::Arc, time::Duration};
 /// The verifier used to verify OAuth tokens.
 #[derive(Clone)]
 pub struct Verifier {
-    // Note that we do not need to use an Arc here, since Py is already a reference-counted
     // pointer
-    inner: Py<PyAny>,
+    inner: Arc<Py<PyAny>>,
     timeout: u64,
     blocking_threadpool: Arc<BlockingThreadpool>,
 }
@@ -103,7 +102,7 @@ impl Verifier {
         })?;
 
         Ok(Self {
-            inner,
+            inner: Arc::new(inner),
             timeout: settings.fxa_oauth_request_timeout,
             blocking_threadpool,
         })