Skip to content

Commit b00ba1c

Browse files
Merge pull request #19 from BitcoinErrorLog/chore/update-uniffi-formatting
chore: Update UniFFI to 0.26 and apply rustfmt formatting
2 parents 0dc814d + 6f2f0fc commit b00ba1c

File tree

4 files changed

+72
-47
lines changed

4 files changed

+72
-47
lines changed

Cargo.lock

Lines changed: 57 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ region = { version = "3", optional = true }
3939
pubky = { version = "0.6.0-rc.6", optional = true }
4040
async-trait = { version = "0.1", optional = true }
4141
tokio = { version = "1", features = ["rt"], optional = true }
42-
uniffi = { version = "0.25", optional = true }
42+
uniffi = { version = "0.26", optional = true }
4343

4444
[build-dependencies]
45-
uniffi_build = "0.25"
45+
uniffi_build = "0.26"
4646

4747
[dev-dependencies]
4848
rand_core = "0.6"
4949
tokio = { version = "1", features = ["full"] }
50-
uniffi_bindgen = "0.25"
50+
uniffi_bindgen = "0.26"
5151
loom = "0.7"
5252
sha2 = "0.10"
5353
rand = "0.8"

src/rate_limiter.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,10 @@ impl RateLimiter {
263263
///
264264
/// Note: Recovers gracefully from lock poisoning rather than panicking.
265265
pub fn tracked_ip_count(&self) -> usize {
266-
self.trackers.lock().unwrap_or_else(|e| e.into_inner()).len()
266+
self.trackers
267+
.lock()
268+
.unwrap_or_else(|e| e.into_inner())
269+
.len()
267270
}
268271

269272
/// Get remaining attempts for an IP within the current window.
@@ -291,7 +294,10 @@ impl RateLimiter {
291294
///
292295
/// Note: Recovers gracefully from lock poisoning rather than panicking.
293296
pub fn clear(&self) {
294-
self.trackers.lock().unwrap_or_else(|e| e.into_inner()).clear();
297+
self.trackers
298+
.lock()
299+
.unwrap_or_else(|e| e.into_inner())
300+
.clear();
295301
}
296302

297303
/// Run cleanup of expired entries.

src/session_manager.rs

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,7 @@ impl<R: RingKeyProvider> ThreadSafeSessionManager<R> {
187187
where
188188
F: FnOnce(&NoiseLink) -> T,
189189
{
190-
let manager = self
191-
.inner
192-
.lock()
193-
.unwrap_or_else(|e| e.into_inner());
190+
let manager = self.inner.lock().unwrap_or_else(|e| e.into_inner());
194191
manager.get_session(session_id).map(f)
195192
}
196193

@@ -201,10 +198,7 @@ impl<R: RingKeyProvider> ThreadSafeSessionManager<R> {
201198
where
202199
F: FnOnce(&mut NoiseLink) -> T,
203200
{
204-
let mut manager = self
205-
.inner
206-
.lock()
207-
.unwrap_or_else(|e| e.into_inner());
201+
let mut manager = self.inner.lock().unwrap_or_else(|e| e.into_inner());
208202
manager.get_session_mut(session_id).map(f)
209203
}
210204

@@ -216,10 +210,7 @@ impl<R: RingKeyProvider> ThreadSafeSessionManager<R> {
216210
session_id: &SessionId,
217211
plaintext: &[u8],
218212
) -> Result<Vec<u8>, crate::errors::NoiseError> {
219-
let mut manager = self
220-
.inner
221-
.lock()
222-
.unwrap_or_else(|e| e.into_inner());
213+
let mut manager = self.inner.lock().unwrap_or_else(|e| e.into_inner());
223214
manager
224215
.get_session_mut(session_id)
225216
.ok_or_else(|| crate::errors::NoiseError::Other("Session not found".to_string()))?
@@ -234,10 +225,7 @@ impl<R: RingKeyProvider> ThreadSafeSessionManager<R> {
234225
session_id: &SessionId,
235226
ciphertext: &[u8],
236227
) -> Result<Vec<u8>, crate::errors::NoiseError> {
237-
let mut manager = self
238-
.inner
239-
.lock()
240-
.unwrap_or_else(|e| e.into_inner());
228+
let mut manager = self.inner.lock().unwrap_or_else(|e| e.into_inner());
241229
manager
242230
.get_session_mut(session_id)
243231
.ok_or_else(|| crate::errors::NoiseError::Other("Session not found".to_string()))?

0 commit comments

Comments
 (0)