diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2020-05-20 11:20:12 +0200 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2020-05-20 11:20:26 +0200 |
commit | 685e35d302873d3047ef86dd8904e769202d23cf (patch) | |
tree | 21db7d442201704bfd146327f11e0411ef2f5b95 /src/types | |
parent | c44d69dcde20d6b200f7c2782a4ebbb848e2ed1f (diff) |
Unite ipfs-api client abstraction into one "Model" type
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'src/types')
-rw-r--r-- | src/types/block.rs | 4 | ||||
-rw-r--r-- | src/types/content.rs | 4 | ||||
-rw-r--r-- | src/types/payload.rs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/types/block.rs b/src/types/block.rs index 1927d55..c70ceef 100644 --- a/src/types/block.rs +++ b/src/types/block.rs @@ -3,7 +3,7 @@ use crate::types::util::Version; use crate::types::content::Content; use crate::types::payload::*; use crate::types::content::LoadedContent; -use crate::repository::repository::Repository; +use crate::model::Model; use anyhow::Error; @@ -42,7 +42,7 @@ impl Block { &self.content } - pub async fn load(self, r: &Repository) -> Result<LoadedBlock, Error> { + pub async fn load(self, r: &Model) -> Result<LoadedBlock, Error> { Ok({ LoadedBlock { version: self.version, diff --git a/src/types/content.rs b/src/types/content.rs index 4812abd..8b6eb4d 100644 --- a/src/types/content.rs +++ b/src/types/content.rs @@ -8,7 +8,7 @@ use crate::types::util::MimeType; use crate::types::util::Timestamp; use crate::types::payload::Payload; use crate::types::payload::LoadedPayload; -use crate::repository::repository::Repository; +use crate::model::Model; #[derive(Serialize, Deserialize, Debug)] pub struct Content { @@ -63,7 +63,7 @@ impl Content { self.devices.push(dev); } - pub async fn load(self, r: &Repository) -> Result<LoadedContent, Error> { + pub async fn load(self, r: &Model) -> Result<LoadedContent, Error> { Ok({ LoadedContent { devices: self.devices, diff --git a/src/types/payload.rs b/src/types/payload.rs index 2d85c22..47f28a6 100644 --- a/src/types/payload.rs +++ b/src/types/payload.rs @@ -6,7 +6,7 @@ use crate::types::util::IPFSHash; use crate::types::util::IPNSHash; use crate::types::util::MimeType; use crate::types::util::Timestamp; -use crate::repository::repository::Repository; +use crate::model::Model; /// The Payload type represents the Payload of a Content object @@ -166,7 +166,7 @@ impl Payload { } } - pub async fn load(self, r: &Repository) -> Result<LoadedPayload, Error> { + pub async fn load(self, r: &Model) -> Result<LoadedPayload, Error> { match self { Payload::None => Ok(LoadedPayload::None), Payload::Post { |