From 4f09829abe27b7c3599cc2dd0117ff33b397bbf2 Mon Sep 17 00:00:00 2001 From: Steve Moyer Date: Tue, 10 Dec 2024 06:53:01 -0500 Subject: [PATCH] feat(delegationtest): update generator to changed delegation.New constructor --- .../data/TokenCarolDan_InvalidExpired.dagcbor | Bin 337 -> 337 bytes .../data/TokenDanErin_InvalidExpired.dagcbor | Bin 337 -> 337 bytes .../data/TokenErinFrank_InvalidExpired.dagcbor | Bin 337 -> 337 bytes .../delegationtest/generator/generator.go | 9 +++++---- token/delegation/delegationtest/token_gen.go | 6 +++--- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/token/delegation/delegationtest/data/TokenCarolDan_InvalidExpired.dagcbor b/token/delegation/delegationtest/data/TokenCarolDan_InvalidExpired.dagcbor index e6777d30cf2b9fe01238d184442e79d8532e2b48..37f437ed3f29d4fafd2d417f410d9365fcd5f819 100644 GIT binary patch delta 82 zcmV-Y0ImPg0?`6Pf>=OZzl-uB+$xaNM_AYF{DBk#B-UdB8Sj~)Y;g(E3Cb=)o@R^j or42-}OWx!0^!yqoQlP3+=W;pZ=$a%_{sIJ%Lw5sMDN2#Olxa#QX#fBK delta 82 zcmV-Y0ImPg0?`6Pf>=P*fwMw)fr?agqX-oH>4v}de4D&AJz|>=ff3p`vTU*8zi&B$ o-C(LWH7h-ENizSSU}NPQxW7ACc|^wgEGY(&Lw5sFw7!wOlvH3Q;Q#;t diff --git a/token/delegation/delegationtest/data/TokenDanErin_InvalidExpired.dagcbor b/token/delegation/delegationtest/data/TokenDanErin_InvalidExpired.dagcbor index b74feda038d8cffc340f7160eb44d56dd4d624a7..ace62982d1df9d125323d1b8a362f5497219ade1 100644 GIT binary patch delta 81 zcmV-X0IvVh0?`6Of>=Nf)qym`63s9;%xvl9qz?WiJwa8}rm#c06ErEEr2Zf2ZQmsi nB+O&2p1C1eiJdBx8I~l*r~eNT!?p5a#vGACcmr4|N|C*k^tUB% delta 81 zcmV-X0IvVh0?`6Of>=QD6GY~*(=XA4s+_cc)2|5(*+yL}v;&TdnCNjBnASVi?HjXB n{f1p#Q{K491&=Oh-kQ1Fd5vY>&;R;P#CBrZ;jL2WTmHLPK0<;y);P1>^kf(^ o!_@T%aanyOY19fOiz_;vFKa;krs?QL)T<1ULw5sMDN2#OlqM1?3;+NC delta 82 zcmV-Y0ImPg0?`6Pf>=PN&<=p*@Ka4IVG5toM#tq*y31pd!xs?&5Nm*!=vzo)ct{O< o22hg0`Q~6WMT_8&v^Qx(4yYCkz^jBB?K}yQLw5sFw7!wOlmN^m>;M1& diff --git a/token/delegation/delegationtest/generator/generator.go b/token/delegation/delegationtest/generator/generator.go index 771346f..1f4a4ef 100644 --- a/token/delegation/delegationtest/generator/generator.go +++ b/token/delegation/delegationtest/generator/generator.go @@ -30,10 +30,11 @@ const ( var constantNonce = []byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b} type newDelegationParams struct { - privKey crypto.PrivKey + privKey crypto.PrivKey // iss aud did.DID cmd command.Command pol policy.Policy + sub did.DID opts []delegation.Option } @@ -89,8 +90,8 @@ func (g *generator) chainPersonas(personas []didtest.Persona, acc acc, vari vari aud: personas[1].DID(), cmd: delegationtest.NominalCommand, pol: policytest.EmptyPolicy, + sub: didtest.PersonaAlice.DID(), opts: []delegation.Option{ - delegation.WithSubject(didtest.PersonaAlice.DID()), delegation.WithNonce(constantNonce), }, } @@ -117,7 +118,7 @@ func (g *generator) chainPersonas(personas []didtest.Persona, acc acc, vari vari p.cmd = delegationtest.AttenuatedCommand }}, {name: "InvalidSubject", variant: func(p *newDelegationParams) { - p.opts = append(p.opts, delegation.WithSubject(didtest.PersonaBob.DID())) + p.sub = didtest.PersonaBob.DID() }}, {name: "InvalidExpired", variant: func(p *newDelegationParams) { // Note: this makes the generator not deterministic @@ -161,7 +162,7 @@ func (g *generator) createDelegation(params newDelegationParams, name string, va return cid.Undef, err } - tkn, err := delegation.New(issDID, params.aud, params.cmd, params.pol, params.opts...) + tkn, err := delegation.New(issDID, params.aud, params.cmd, params.pol, params.sub, params.opts...) if err != nil { return cid.Undef, err } diff --git a/token/delegation/delegationtest/token_gen.go b/token/delegation/delegationtest/token_gen.go index 5983c6a..e5a924e 100644 --- a/token/delegation/delegationtest/token_gen.go +++ b/token/delegation/delegationtest/token_gen.go @@ -107,21 +107,21 @@ var ( ) var ( - TokenCarolDan_InvalidExpiredCID = cid.MustParse("bafyreigvdcarp6426e5aenal3q3c4uyhncwfbmt3fsmb4qzspkpjy57gti") + TokenCarolDan_InvalidExpiredCID = cid.MustParse("bafyreifyzm5jkx2sfu5awyndg3dn5zlg7sq5hssgfatafk62kiiilapnqe") TokenCarolDan_InvalidExpiredSealed = mustGetBundle(TokenCarolDan_InvalidExpiredCID).Sealed TokenCarolDan_InvalidExpiredBundle = mustGetBundle(TokenCarolDan_InvalidExpiredCID) TokenCarolDan_InvalidExpired = mustGetBundle(TokenCarolDan_InvalidExpiredCID).Decoded ) var ( - TokenDanErin_InvalidExpiredCID = cid.MustParse("bafyreifa265mung4nfpjjuiir5nytzgbrhfl66ye2dqmbq4p6dm7bzp4he") + TokenDanErin_InvalidExpiredCID = cid.MustParse("bafyreihhnisabmkofuk3qaw37leijxqjaz5or6v2cufjxwzdkvuvv2dzbq") TokenDanErin_InvalidExpiredSealed = mustGetBundle(TokenDanErin_InvalidExpiredCID).Sealed TokenDanErin_InvalidExpiredBundle = mustGetBundle(TokenDanErin_InvalidExpiredCID) TokenDanErin_InvalidExpired = mustGetBundle(TokenDanErin_InvalidExpiredCID).Decoded ) var ( - TokenErinFrank_InvalidExpiredCID = cid.MustParse("bafyreicde2per7ynjruvstuae67dxzdg2iepid3nonrmgr6tvodzpbqomu") + TokenErinFrank_InvalidExpiredCID = cid.MustParse("bafyreigeokaziviwm5kzmkpwesj3gta5k7zrd62x4a746fnrnkhvatwbna") TokenErinFrank_InvalidExpiredSealed = mustGetBundle(TokenErinFrank_InvalidExpiredCID).Sealed TokenErinFrank_InvalidExpiredBundle = mustGetBundle(TokenErinFrank_InvalidExpiredCID) TokenErinFrank_InvalidExpired = mustGetBundle(TokenErinFrank_InvalidExpiredCID).Decoded