From 84cbed52c23b9b3aa153c6d35c36e18850f0b3af Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Thu, 16 Dec 2021 12:23:29 -0700
Subject: [PATCH] use general error for `lock` fn on handle

---
 patch-db/src/handle.rs      | 8 ++++----
 patch-db/src/transaction.rs | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patch-db/src/handle.rs b/patch-db/src/handle.rs
index 88e627c..9190cb0 100644
--- a/patch-db/src/handle.rs
+++ b/patch-db/src/handle.rs
@@ -8,7 +8,7 @@ use serde_json::Value;
 use tokio::sync::broadcast::Receiver;
 use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 
-use crate::locker::{Guard, LockError, LockType};
+use crate::locker::{Guard, LockType};
 use crate::patch::DiffPatch;
 use crate::{Error, Locker, PatchDb, Revision, Store, Transaction};
 
@@ -68,7 +68,7 @@ pub trait DbHandle: Send + Sync {
         patch: DiffPatch,
         store_write_lock: Option<RwLockWriteGuard<'_, Store>>,
     ) -> Result<Option<Arc<Revision>>, Error>;
-    async fn lock(&mut self, ptr: JsonPointer, lock_type: LockType) -> Result<(), LockError>;
+    async fn lock(&mut self, ptr: JsonPointer, lock_type: LockType) -> Result<(), Error>;
     async fn get<
         T: for<'de> Deserialize<'de>,
         S: AsRef<str> + Send + Sync,
@@ -154,7 +154,7 @@ impl<Handle: DbHandle + ?Sized> DbHandle for &mut Handle {
     ) -> Result<Option<Arc<Revision>>, Error> {
         (*self).apply(patch, store_write_lock).await
     }
-    async fn lock(&mut self, ptr: JsonPointer, lock_type: LockType) -> Result<(), LockError> {
+    async fn lock(&mut self, ptr: JsonPointer, lock_type: LockType) -> Result<(), Error> {
         (*self).lock(ptr, lock_type).await
     }
     async fn get<
@@ -266,7 +266,7 @@ impl DbHandle for PatchDbHandle {
     ) -> Result<Option<Arc<Revision>>, Error> {
         self.db.apply(patch, None, store_write_lock).await
     }
-    async fn lock(&mut self, ptr: JsonPointer, lock_type: LockType) -> Result<(), LockError> {
+    async fn lock(&mut self, ptr: JsonPointer, lock_type: LockType) -> Result<(), Error> {
         Ok(self
             .locks
             .push(self.db.locker.lock(self.id.clone(), ptr, lock_type).await?))
diff --git a/patch-db/src/transaction.rs b/patch-db/src/transaction.rs
index acc794e..1fcec18 100644
--- a/patch-db/src/transaction.rs
+++ b/patch-db/src/transaction.rs
@@ -10,7 +10,7 @@ use tokio::sync::broadcast::Receiver;
 use tokio::sync::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 
 use crate::handle::HandleId;
-use crate::locker::{Guard, LockError, LockType, Locker};
+use crate::locker::{Guard, LockType, Locker};
 use crate::patch::{DiffPatch, Revision};
 use crate::store::Store;
 use crate::{DbHandle, Error, PatchDbHandle};
@@ -165,7 +165,7 @@ impl<Parent: DbHandle + Send + Sync> DbHandle for Transaction<Parent> {
         self.updates.append(patch);
         Ok(None)
     }
-    async fn lock(&mut self, ptr: JsonPointer, lock_type: LockType) -> Result<(), LockError> {
+    async fn lock(&mut self, ptr: JsonPointer, lock_type: LockType) -> Result<(), Error> {
         Ok(self.locks.push(
             self.parent
                 .locker()