Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test CACAO DagCbor round-trip #13

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Test CACAO DagCbor round-trip #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94a2967
Test CACAO DagCbor round-trip
clehner Apr 1, 2022
98ca31d
Use siwe git dependency URL
clehner Apr 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ zcap = ["ssi"]
default = ["eip4361", "zcap"]

[dependencies]
siwe = { version = "0.2" }
siwe = { git = "https://github.com/spruceid/siwe-rs/", rev = "d2066b3638adab31b6a6d11c21b828147b2d03fa" }
iri-string = { version = "0.4", features = ["serde", "serde-std"] }
chrono = "0.4"
thiserror = "1.0"
Expand Down
38 changes: 33 additions & 5 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ where
}
}

#[derive(DagCbor)]
#[derive(DagCbor, Clone, Debug, PartialEq)]
pub struct Header {
t: String,
}
Expand Down Expand Up @@ -131,12 +131,12 @@ where
}
}

#[derive(Copy, Clone)]
#[derive(Copy, Clone, Debug, PartialEq)]
pub enum Version {
V1 = 1,
}

#[derive(Clone)]
#[derive(Clone, PartialEq, Debug)]
pub struct Payload {
pub domain: Authority,
pub iss: UriAbsoluteString,
Expand Down Expand Up @@ -282,7 +282,7 @@ mod payload_ipld {
}
}

#[derive(DagCbor)]
#[derive(DagCbor, Debug, PartialEq)]
pub struct CACAOIpld {
#[ipld(rename = "h")]
header: Header,
Expand All @@ -295,10 +295,12 @@ pub struct CACAOIpld {
#[cfg(test)]
pub mod tests {
use super::*;
use libipld::codec::assert_roundtrip;
use libipld::ipld;
use std::io::Cursor;
#[test]
fn test_ipld() {
let _cacao = CACAOIpld::decode(
let cacao = CACAOIpld::decode(
DagCborCodec,
&mut Cursor::new([
163u8, 97u8, 104u8, 161u8, 97u8, 116u8, 103u8, 101u8, 105u8, 112u8, 52u8, 51u8,
Expand Down Expand Up @@ -348,5 +350,31 @@ pub mod tests {
]),
)
.unwrap();
assert_roundtrip(
DagCborCodec,
&cacao,
&ipld!({
"h": {
"t": "eip4361",
},
"p": {
"aud": "did:key:z6MkrBdNdwUPnXDVD1DCxedzVVBpaGi8aSmoXFAeKNgtAer8",
"domain": "service.org",
"iat": "2021-09-30T16:25:24.000Z",
"iss": "did:pkh:eip155:1:0xBd9D9c7DC389715a89fC8149E4a5Be91336B2796",
"nonce": "32891757",
"resources": [
"ipfs://Qme7ss3ARVgxv6rXqVPiikMJ8u2NLgmgszg13pYrDKEoiu",
"https://example.com/my-web2-claim.json",
],
"statement": "I accept the ServiceOrg Terms of Service: https://service.org/tos",
"version": "1",
},
"s": {
"s": "0x109313e7525dea55ec9a3ccbb63ea8d68406366250cf0880d67032b457ab33c926c67ff3fcc66ac31baa6868a80a12fbe6b7638a89f4f6d51a0229590cf6676f1c",
"t": "eip191",
},
}),
);
}
}