From b29d70badd1f867cf7703fe3c9935a242835adac Mon Sep 17 00:00:00 2001 From: Simon Heath Date: Mon, 16 Oct 2017 21:25:04 -0400 Subject: [PATCH 1/5] Implemented clone, etc on IpfsApi --- src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib.rs b/src/lib.rs index 96c0c14..5b6ac41 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -19,6 +19,7 @@ mod ipns; mod object; mod version; +#[derive(Clone, PartialEq, Hash)] pub struct IpfsApi { server: String, port: u16 From 47502c326d440001d4b5497cce2131cd1e5cd69c Mon Sep 17 00:00:00 2001 From: Simon Heath Date: Mon, 16 Oct 2017 21:25:04 -0400 Subject: [PATCH 2/5] Implemented clone, etc on IpfsApi --- src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib.rs b/src/lib.rs index 96c0c14..5b6ac41 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -19,6 +19,7 @@ mod ipns; mod object; mod version; +#[derive(Clone, PartialEq, Hash)] pub struct IpfsApi { server: String, port: u16 From 0a1b001c3cb896d8938eb1f7da0081d8dd193e74 Mon Sep 17 00:00:00 2001 From: Simon Heath Date: Mon, 16 Oct 2017 21:34:19 -0400 Subject: [PATCH 3/5] Add debug --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 5b6ac41..b9b4e4e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -19,7 +19,7 @@ mod ipns; mod object; mod version; -#[derive(Clone, PartialEq, Hash)] +#[derive(Clone, PartialEq, Hash, Debug)] pub struct IpfsApi { server: String, port: u16 From fe46b6354dbe69436ef5fb6e096125696200ac61 Mon Sep 17 00:00:00 2001 From: Simon Heath Date: Tue, 17 Oct 2017 09:58:56 -0400 Subject: [PATCH 4/5] Added more object stat info --- src/object.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/object.rs b/src/object.rs index 9c952a0..19a8b29 100644 --- a/src/object.rs +++ b/src/object.rs @@ -14,6 +14,10 @@ error_chain! { #[serde(rename_all="PascalCase")] pub struct ObjectStats { hash: String, + num_links: u64, + block_size: u64, + links_size: u64, + data_size: u64, cumulative_size: u64 } @@ -39,6 +43,10 @@ mod tests { let stats = api.object_stats("QmWATWQ7fVPP2EFGu71UkfnqhYXDYH566qy47CnJDgvs8u").unwrap(); let desired = ObjectStats { hash: "QmWATWQ7fVPP2EFGu71UkfnqhYXDYH566qy47CnJDgvs8u".to_string(), + num_links: 0, + block_size: 20, + links_size: 2, + data_size: 18, cumulative_size: 20, }; From 3c8bc38e24e19f0eb470b3019c72d305d9a5a573 Mon Sep 17 00:00:00 2001 From: Simon Heath Date: Tue, 17 Oct 2017 11:50:08 -0400 Subject: [PATCH 5/5] Make object fields public --- src/object.rs | 14 +++++++------- src/pin.rs | 13 ++++++------- src/pubsub.rs | 6 +++--- src/version.rs | 10 +++++----- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/object.rs b/src/object.rs index 19a8b29..618454e 100644 --- a/src/object.rs +++ b/src/object.rs @@ -13,12 +13,12 @@ error_chain! { #[derive(Deserialize, Debug, PartialEq, Hash)] #[serde(rename_all="PascalCase")] pub struct ObjectStats { - hash: String, - num_links: u64, - block_size: u64, - links_size: u64, - data_size: u64, - cumulative_size: u64 + pub hash: String, + pub num_links: u64, + pub block_size: u64, + pub links_size: u64, + pub data_size: u64, + pub cumulative_size: u64 } impl IpfsApi { @@ -52,4 +52,4 @@ mod tests { assert_eq!(stats, desired); } -} \ No newline at end of file +} diff --git a/src/pin.rs b/src/pin.rs index 1490758..694d149 100644 --- a/src/pin.rs +++ b/src/pin.rs @@ -15,27 +15,27 @@ error_chain! { #[derive(Deserialize, Debug, PartialEq, Hash)] #[serde(rename_all="PascalCase")] pub struct PinAddResponse { - pins: Vec, - progress: Option + pub pins: Vec, + pub progress: Option } #[derive(Deserialize, Debug, PartialEq, Hash)] #[serde(rename_all="PascalCase")] pub struct PinRmResponse { - pins: Vec + pub pins: Vec } #[derive(Deserialize, Debug, PartialEq, Hash)] pub struct PinType { #[serde(rename = "Type")] - objtype: String, + pub objtype: String, } #[derive(Deserialize, Debug, PartialEq)] #[serde(rename_all="PascalCase")] pub struct PinList { // keys: Vec - keys: HashMap + pub keys: HashMap } impl IpfsApi { @@ -82,7 +82,6 @@ impl IpfsApi { #[cfg(test)] mod tests { - use std::collections::HashMap; use IpfsApi; use super::*; @@ -132,4 +131,4 @@ mod tests { }; assert_eq!(resp.unwrap(), desired); } -} \ No newline at end of file +} diff --git a/src/pubsub.rs b/src/pubsub.rs index f10bfe2..ee8dd53 100644 --- a/src/pubsub.rs +++ b/src/pubsub.rs @@ -22,9 +22,9 @@ struct JsonPubSubMessage { #[derive(Debug)] pub struct PubSubMessage { - data: Option>, - from: Option>, - seqno: Option> + pub data: Option>, + pub from: Option>, + pub seqno: Option> } impl PubSubMessage { diff --git a/src/version.rs b/src/version.rs index c8deee8..079c1cb 100644 --- a/src/version.rs +++ b/src/version.rs @@ -13,11 +13,11 @@ error_chain! { #[derive(Deserialize, Debug)] #[serde(rename_all="PascalCase")] pub struct IpfsVersion { - version: String, - commit: String, - repo: String, - system: String, - golang: String + pub version: String, + pub commit: String, + pub repo: String, + pub system: String, + pub golang: String } impl IpfsApi {