diff options
Diffstat (limited to 'adenosine/src/ipld.rs')
| -rw-r--r-- | adenosine/src/ipld.rs | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/adenosine/src/ipld.rs b/adenosine/src/ipld.rs index 63f29dc..d188916 100644 --- a/adenosine/src/ipld.rs +++ b/adenosine/src/ipld.rs @@ -12,12 +12,16 @@ pub fn ipld_into_json_value(val: Ipld) -> Value { Ipld::Integer(v) => json!(v), Ipld::Float(v) => json!(v), Ipld::String(s) => Value::String(s), - Ipld::Bytes(b) => Value::String(data_encoding::BASE64_NOPAD.encode(&b)), + Ipld::Bytes(b) => json!({ + "$bytes": Value::String(data_encoding::BASE64_NOPAD.encode(&b)), + }), Ipld::List(l) => Value::Array(l.into_iter().map(ipld_into_json_value).collect()), Ipld::Map(m) => Value::Object(serde_json::Map::from_iter( m.into_iter().map(|(k, v)| (k, ipld_into_json_value(v))), )), - Ipld::Link(c) => Value::String(c.to_string()), + Ipld::Link(c) => json!({ + "$link": Value::String(c.to_string()), + }), } } @@ -34,14 +38,21 @@ pub fn json_value_into_ipld(val: Value) -> Ipld { Value::Number(v) => Ipld::Float(v.as_f64().unwrap()), Value::Array(l) => Ipld::List(l.into_iter().map(json_value_into_ipld).collect()), Value::Object(m) => { - let map: BTreeMap<String, Ipld> = BTreeMap::from_iter(m.into_iter().map(|(k, v)| { - if k == "cid" && v.is_string() { - (k, Ipld::Link(Cid::from_str(v.as_str().unwrap()).unwrap())) - } else { - (k, json_value_into_ipld(v)) - } - })); - Ipld::Map(map) + if m.len() == 1 && m.contains_key("$link") { + let cid_str = m["$link"].as_str().expect("$link as CID string"); + Ipld::Link(Cid::from_str(cid_str).unwrap()) + } else if m.len() == 1 && m.contains_key("$bytes") { + let bytes_b64 = m["$bytes"].as_str().expect("$bytes as base64 string"); + Ipld::Bytes( + data_encoding::BASE64_NOPAD + .decode(bytes_b64.as_bytes()) + .expect("valid base64 in $bytes"), + ) + } else { + let map: BTreeMap<String, Ipld> = + BTreeMap::from_iter(m.into_iter().map(|(k, v)| (k, json_value_into_ipld(v)))); + Ipld::Map(map) + } } } } |