Skip to content
This repository was archived by the owner on Oct 23, 2022. It is now read-only.

Commit aca0b14

Browse files
ljedrzljedrz
committed
feat: make Ipns an async_trait
Signed-off-by: ljedrz <[email protected]>
1 parent c6952cb commit aca0b14

File tree

4 files changed

+41
-47
lines changed

4 files changed

+41
-47
lines changed

‎src/dag.rs

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -99,21 +99,19 @@ mod tests {
9999
#[async_std::test]
100100
async fn test_resolve_root_cid() {
101101
let Node { ipfs, bg_task: _bt } = Node::new("test_node").await;
102-
let dag = IpldDag::new(ipfs);
103102
let data = ipld!([1, 2, 3]);
104-
let cid = dag.put(data.clone(), Codec::DagCBOR).await.unwrap();
105-
let res = dag.get(IpfsPath::from(cid)).await.unwrap();
103+
let cid = ipfs.put_dag(data.clone()).await.unwrap();
104+
let res = ipfs.get_dag(IpfsPath::from(cid)).await.unwrap();
106105
assert_eq!(res, data);
107106
}
108107

109108
#[async_std::test]
110109
async fn test_resolve_array_elem() {
111110
let Node { ipfs, bg_task: _bt } = Node::new("test_node").await;
112-
let dag = IpldDag::new(ipfs);
113111
let data = ipld!([1, 2, 3]);
114-
let cid = dag.put(data.clone(), Codec::DagCBOR).await.unwrap();
115-
let res = dag
116-
.get(IpfsPath::from(cid).sub_path("1").unwrap())
112+
let cid = ipfs.put_dag(data.clone()).await.unwrap();
113+
let res = ipfs
114+
.get_dag(IpfsPath::from(cid).sub_path("1").unwrap())
117115
.await
118116
.unwrap();
119117
assert_eq!(res, ipld!(2));
@@ -122,11 +120,10 @@ mod tests {
122120
#[async_std::test]
123121
async fn test_resolve_nested_array_elem() {
124122
let Node { ipfs, bg_task: _bt } = Node::new("test_node").await;
125-
let dag = IpldDag::new(ipfs);
126123
let data = ipld!([1, [2], 3,]);
127-
let cid = dag.put(data, Codec::DagCBOR).await.unwrap();
128-
let res = dag
129-
.get(IpfsPath::from(cid).sub_path("1/0").unwrap())
124+
let cid = ipfs.put_dag(data).await.unwrap();
125+
let res = ipfs
126+
.get_dag(IpfsPath::from(cid).sub_path("1/0").unwrap())
130127
.await
131128
.unwrap();
132129
assert_eq!(res, ipld!(2));
@@ -135,13 +132,12 @@ mod tests {
135132
#[async_std::test]
136133
async fn test_resolve_object_elem() {
137134
let Node { ipfs, bg_task: _bt } = Node::new("test_node").await;
138-
let dag = IpldDag::new(ipfs);
139135
let data = ipld!({
140136
"key": false,
141137
});
142-
let cid = dag.put(data, Codec::DagCBOR).await.unwrap();
143-
let res = dag
144-
.get(IpfsPath::from(cid).sub_path("key").unwrap())
138+
let cid = ipfs.put_dag(data).await.unwrap();
139+
let res = ipfs
140+
.get_dag(IpfsPath::from(cid).sub_path("key").unwrap())
145141
.await
146142
.unwrap();
147143
assert_eq!(res, ipld!(false));
@@ -150,13 +146,12 @@ mod tests {
150146
#[async_std::test]
151147
async fn test_resolve_cid_elem() {
152148
let Node { ipfs, bg_task: _bt } = Node::new("test_node").await;
153-
let dag = IpldDag::new(ipfs);
154149
let data1 = ipld!([1]);
155-
let cid1 = dag.put(data1, Codec::DagCBOR).await.unwrap();
150+
let cid1 = ipfs.put_dag(data1).await.unwrap();
156151
let data2 = ipld!([cid1]);
157-
let cid2 = dag.put(data2, Codec::DagCBOR).await.unwrap();
158-
let res = dag
159-
.get(IpfsPath::from(cid2).sub_path("0/0").unwrap())
152+
let cid2 = ipfs.put_dag(data2).await.unwrap();
153+
let res = ipfs
154+
.get_dag(IpfsPath::from(cid2).sub_path("0/0").unwrap())
160155
.await
161156
.unwrap();
162157
assert_eq!(res, ipld!(1));

‎src/ipns/mod.rs

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#![allow(dead_code)]
22
use crate::error::Error;
33
use crate::path::{IpfsPath, PathRoot};
4-
use crate::repo::RepoTypes;
5-
use crate::Ipfs;
4+
use crate::repo::{Repo, RepoTypes};
5+
use async_trait::async_trait;
66
use libp2p::PeerId;
77

88
mod dns;
@@ -11,22 +11,23 @@ mod ipns_pb {
1111
include!(concat!(env!("OUT_DIR"), "/ipns_pb.rs"));
1212
}
1313

14-
#[derive(Clone, Debug)]
15-
pub struct Ipns<Types: RepoTypes> {
16-
ipfs: Ipfs<Types>,
17-
}
14+
#[async_trait]
15+
pub trait Ipns {
16+
async fn resolve_ipns(&self, path: &IpfsPath) -> Result<IpfsPath, Error>;
1817

19-
impl<Types: RepoTypes> Ipns<Types> {
20-
pub fn new(ipfs: Ipfs<Types>) -> Self {
21-
Ipns { ipfs }
22-
}
18+
async fn publish_ipns(&self, key: &PeerId, path: &IpfsPath) -> Result<IpfsPath, Error>;
19+
20+
async fn cancel_ipns(&self, key: &PeerId) -> Result<(), Error>;
21+
}
2322

23+
#[async_trait]
24+
impl<Types: RepoTypes> Ipns for Repo<Types> {
2425
/// Resolves a ipns path to an ipld path.
25-
pub async fn resolve(&self, path: &IpfsPath) -> Result<IpfsPath, Error> {
26+
async fn resolve_ipns(&self, path: &IpfsPath) -> Result<IpfsPath, Error> {
2627
let path = path.to_owned();
2728
match path.root() {
2829
PathRoot::Ipld(_) => Ok(path),
29-
PathRoot::Ipns(peer_id) => match self.ipfs.repo.get_ipns(peer_id).await? {
30+
PathRoot::Ipns(peer_id) => match self.get_ipns(peer_id).await? {
3031
Some(path) => Ok(path),
3132
None => Err(anyhow::anyhow!("unimplemented")),
3233
},
@@ -35,8 +36,8 @@ impl<Types: RepoTypes> Ipns<Types> {
3536
}
3637

3738
/// Publishes an ipld path.
38-
pub async fn publish(&self, key: &PeerId, path: &IpfsPath) -> Result<IpfsPath, Error> {
39-
let future = self.ipfs.repo.put_ipns(key, path);
39+
async fn publish_ipns(&self, key: &PeerId, path: &IpfsPath) -> Result<IpfsPath, Error> {
40+
let future = self.put_ipns(key, path);
4041
let key = key.to_owned();
4142
let mut path = path.to_owned();
4243
future.await?;
@@ -45,8 +46,8 @@ impl<Types: RepoTypes> Ipns<Types> {
4546
}
4647

4748
/// Cancel an ipns path.
48-
pub async fn cancel(&self, key: &PeerId) -> Result<(), Error> {
49-
self.ipfs.repo.remove_ipns(key).await?;
49+
async fn cancel_ipns(&self, key: &PeerId) -> Result<(), Error> {
50+
self.remove_ipns(key).await?;
5051
Ok(())
5152
}
5253
}

‎src/lib.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,6 @@ impl<Types: IpfsTypes> std::ops::Deref for Ipfs<Types> {
350350
}
351351

352352
impl<Types: IpfsTypes> Ipfs<Types> {
353-
fn ipns(&self) -> Ipns<Types> {
354-
Ipns::new(self.clone())
355-
}
356-
357353
/// Puts a block into the ipfs repo.
358354
pub async fn put_block(&self, block: Block) -> Result<Cid, Error> {
359355
self.repo
@@ -445,23 +441,26 @@ impl<Types: IpfsTypes> Ipfs<Types> {
445441

446442
/// Resolves a ipns path to an ipld path.
447443
pub async fn resolve_ipns(&self, path: &IpfsPath) -> Result<IpfsPath, Error> {
448-
self.ipns()
449-
.resolve(path)
444+
self.repo
445+
.resolve_ipns(path)
450446
.instrument(self.span.clone())
451447
.await
452448
}
453449

454450
/// Publishes an ipld path.
455451
pub async fn publish_ipns(&self, key: &PeerId, path: &IpfsPath) -> Result<IpfsPath, Error> {
456-
self.ipns()
457-
.publish(key, path)
452+
self.repo
453+
.publish_ipns(key, path)
458454
.instrument(self.span.clone())
459455
.await
460456
}
461457

462458
/// Cancel an ipns path.
463459
pub async fn cancel_ipns(&self, key: &PeerId) -> Result<(), Error> {
464-
self.ipns().cancel(key).instrument(self.span.clone()).await
460+
self.repo
461+
.cancel_ipns(key)
462+
.instrument(self.span.clone())
463+
.await
465464
}
466465

467466
pub async fn connect<T: Into<ConnectionTarget>>(&self, target: T) -> Result<(), Error> {

‎src/unixfs/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,10 @@ mod tests {
7777
#[async_std::test]
7878
async fn test_file_cid() {
7979
let Node { ipfs, bg_task: _bt } = Node::new("test_node").await;
80-
let dag = IpldDag::new(ipfs);
8180
let file = File::from("\u{8}\u{2}\u{12}\u{12}Here is some data\n\u{18}\u{12}");
8281
let cid = Cid::try_from("QmSy5pnHk1EnvE5dmJSyFKG5unXLGjPpBuJJCBQkBTvBaW").unwrap();
8382

84-
let cid2 = file.put_unixfs_v1(&dag).await.unwrap();
83+
let cid2 = file.put_unixfs_v1(&ipfs.repo).await.unwrap();
8584
assert_eq!(cid.to_string(), cid2.to_string());
8685
}
8786
}

0 commit comments

Comments
 (0)