feat: make Ipns an async_trait

Signed-off-by: ljedrz <ljedrz@gmail.com>

Author: ljedrz

src/ipns/mod.rs

@@ -1,8 +1,8 @@
 #![allow(dead_code)]
 use crate::error::Error;
 use crate::path::{IpfsPath, PathRoot};
-use crate::repo::RepoTypes;
-use crate::Ipfs;
+use crate::repo::{Repo, RepoTypes};
+use async_trait::async_trait;
 use libp2p::PeerId;
 
 mod dns;
@@ -11,22 +11,23 @@ mod ipns_pb {
     include!(concat!(env!("OUT_DIR"), "/ipns_pb.rs"));
 }
 
-#[derive(Clone, Debug)]
-pub struct Ipns<Types: RepoTypes> {
-    ipfs: Ipfs<Types>,
-}
+#[async_trait]
+pub trait Ipns {
+    async fn resolve_ipns(&self, path: &IpfsPath) -> Result<IpfsPath, Error>;
 
-impl<Types: RepoTypes> Ipns<Types> {
-    pub fn new(ipfs: Ipfs<Types>) -> Self {
-        Ipns { ipfs }
-    }
+    async fn publish_ipns(&self, key: &PeerId, path: &IpfsPath) -> Result<IpfsPath, Error>;
+
+    async fn cancel_ipns(&self, key: &PeerId) -> Result<(), Error>;
+}
 
+#[async_trait]
+impl<Types: RepoTypes> Ipns for Repo<Types> {
     /// Resolves a ipns path to an ipld path.
-    pub async fn resolve(&self, path: &IpfsPath) -> Result<IpfsPath, Error> {
+    async fn resolve_ipns(&self, path: &IpfsPath) -> Result<IpfsPath, Error> {
         let path = path.to_owned();
         match path.root() {
             PathRoot::Ipld(_) => Ok(path),
-            PathRoot::Ipns(peer_id) => match self.ipfs.repo.get_ipns(peer_id).await? {
+            PathRoot::Ipns(peer_id) => match self.get_ipns(peer_id).await? {
                 Some(path) => Ok(path),
                 None => Err(anyhow::anyhow!("unimplemented")),
             },
@@ -35,8 +36,8 @@ impl<Types: RepoTypes> Ipns<Types> {
     }
 
     /// Publishes an ipld path.
-    pub async fn publish(&self, key: &PeerId, path: &IpfsPath) -> Result<IpfsPath, Error> {
-        let future = self.ipfs.repo.put_ipns(key, path);
+    async fn publish_ipns(&self, key: &PeerId, path: &IpfsPath) -> Result<IpfsPath, Error> {
+        let future = self.put_ipns(key, path);
         let key = key.to_owned();
         let mut path = path.to_owned();
         future.await?;
@@ -45,8 +46,8 @@ impl<Types: RepoTypes> Ipns<Types> {
     }
 
     /// Cancel an ipns path.
-    pub async fn cancel(&self, key: &PeerId) -> Result<(), Error> {
-        self.ipfs.repo.remove_ipns(key).await?;
+    async fn cancel_ipns(&self, key: &PeerId) -> Result<(), Error> {
+        self.remove_ipns(key).await?;
         Ok(())
     }
 }

src/lib.rs

@@ -350,10 +350,6 @@ impl<Types: IpfsTypes> std::ops::Deref for Ipfs<Types> {
 }
 
 impl<Types: IpfsTypes> Ipfs<Types> {
-    fn ipns(&self) -> Ipns<Types> {
-        Ipns::new(self.clone())
-    }
-
     /// Puts a block into the ipfs repo.
     pub async fn put_block(&self, block: Block) -> Result<Cid, Error> {
         self.repo
@@ -445,23 +441,26 @@ impl<Types: IpfsTypes> Ipfs<Types> {
 
     /// Resolves a ipns path to an ipld path.
     pub async fn resolve_ipns(&self, path: &IpfsPath) -> Result<IpfsPath, Error> {
-        self.ipns()
-            .resolve(path)
+        self.repo
+            .resolve_ipns(path)
             .instrument(self.span.clone())
             .await
     }
 
     /// Publishes an ipld path.
     pub async fn publish_ipns(&self, key: &PeerId, path: &IpfsPath) -> Result<IpfsPath, Error> {
-        self.ipns()
-            .publish(key, path)
+        self.repo
+            .publish_ipns(key, path)
             .instrument(self.span.clone())
             .await
     }
 
     /// Cancel an ipns path.
     pub async fn cancel_ipns(&self, key: &PeerId) -> Result<(), Error> {
-        self.ipns().cancel(key).instrument(self.span.clone()).await
+        self.repo
+            .cancel_ipns(key)
+            .instrument(self.span.clone())
+            .await
     }
 
     pub async fn connect<T: Into<ConnectionTarget>>(&self, target: T) -> Result<(), Error> {