use objectclass::ObjectClass;
use server::{Id, Entry, Result};

pub trait Transaction<D> {
    fn commit(self) -> Result<()>;
    fn get(&self, database: D, key: &[u8]) -> Result<&[u8]>;
    fn find<P>(&self, db: D, key: &[u8], predicate: P) -> Result<&[u8]> where P: Fn(&[u8]) -> bool;
}

pub trait Adapter<'a, D, R: Transaction<D>, W: Transaction<D>> {
    fn ro_transaction(&'a self) -> Result<R>;
    fn rw_transaction(&'a self) -> Result<W>;
    fn next_available_id(&self, txn: &W) -> Result<Id>;
    fn add_entry<'b>(&'b self,
                     txn: &'b mut W,
                     id: Id,
                     parent_id: Id,
                     name: &'b str,
                     objectclass: ObjectClass)
                     -> Result<Entry>;
    fn find_entry<'b, T: Transaction<D>>(&'b self, txn: &'b T, path: &str) -> Result<Entry>;
}

use objectclass::ObjectClass;
use server::{Id, Entry, Result};

pub trait Transaction<D> {
    fn commit(self) -> Result<()>;

    // TODO: these are the guts of LmdbAdapter leaking out. They should get moved elsewhere
    fn get(&self, database: D, key: &[u8]) -> Result<&[u8]>;
    fn find<P>(&self, db: D, key: &[u8], predicate: P) -> Result<&[u8]> where P: Fn(&[u8]) -> bool;
}

pub trait Adapter<'a, D, R: Transaction<D>, W: Transaction<D>> {
    fn ro_transaction(&'a self) -> Result<R>;
    fn rw_transaction(&'a self) -> Result<W>;
    fn next_available_id(&self, txn: &W) -> Result<Id>;
    fn add_entry<'b>(&'b self,
                     txn: &'b mut W,
                     id: Id,
                     parent_id: Id,
                     name: &'b str,
                     objectclass: ObjectClass)
                     -> Result<Entry>;
    fn find_entry<'b, T: Transaction<D>>(&'b self, txn: &'b T, path: &str) -> Result<Entry>;
}

--- 
+++ 
@@ -3,8 +3,6 @@
 
 pub trait Transaction<D> {
     fn commit(self) -> Result<()>;
-
-    // TODO: these are the guts of LmdbAdapter leaking out. They should get moved elsewhere
     fn get(&self, database: D, key: &[u8]) -> Result<&[u8]>;
     fn find<P>(&self, db: D, key: &[u8], predicate: P) -> Result<&[u8]> where P: Fn(&[u8]) -> bool;
 }
Remove scary TODO message from Transaction

I am beginning to think that adapter.rs is actually interestingly
generic across ordered k/v stores like LMDB.

Perhaps the Transaction trait is actually OK as described, and would
allow some of the functionality presently in LmdbAdapter to be reused
with other similar backends.
