From f7794771188ca7b664cf4b81a7225573be61fe8e Mon Sep 17 00:00:00 2001 From: Steve Moyer Date: Tue, 24 Sep 2024 09:08:07 -0400 Subject: [PATCH] chore(envelope): clean up TODOs --- internal/envelope/cid.go | 12 ------------ internal/envelope/cid_test.go | 7 +++++-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/internal/envelope/cid.go b/internal/envelope/cid.go index 74ac583..410acbb 100644 --- a/internal/envelope/cid.go +++ b/internal/envelope/cid.go @@ -6,7 +6,6 @@ import ( "io" "github.com/ipfs/go-cid" - "github.com/libp2p/go-libp2p/core/crypto" "github.com/multiformats/go-multibase" "github.com/multiformats/go-multicodec" "github.com/multiformats/go-multihash" @@ -20,17 +19,6 @@ func CIDToBase58BTC(id cid.Cid) string { return id.Encode(b58BTCEnc) } -// CID returns the UCAN content identifier a Tokener. -// TODO: remove? -func CID(privKey crypto.PrivKey, token Tokener) (cid.Cid, error) { - data, err := ToDagCbor(privKey, token) - if err != nil { - return cid.Undef, err - } - - return CIDFromBytes(data) -} - // CIDFromBytes returns the UCAN content identifier for an arbitrary slice // of bytes. func CIDFromBytes(b []byte) (cid.Cid, error) { diff --git a/internal/envelope/cid_test.go b/internal/envelope/cid_test.go index 290ddd4..46f62d0 100644 --- a/internal/envelope/cid_test.go +++ b/internal/envelope/cid_test.go @@ -14,14 +14,17 @@ import ( "github.com/ucan-wg/go-ucan/internal/envelope" ) -func TestCid(t *testing.T) { +func TestCidFromBytes(t *testing.T) { t.Parallel() expData := golden.Get(t, "example.dagcbor") expHash, err := multihash.Sum(expData, uint64(multicodec.Sha2_256), -1) require.NoError(t, err) - id, err := envelope.CID(examplePrivKey(t), newExample(t)) + data, err := envelope.ToDagCbor(examplePrivKey(t), newExample(t)) + require.NoError(t, err) + + id, err := envelope.CIDFromBytes(data) require.NoError(t, err) assert.Equal(t, exampleCID, envelope.CIDToBase58BTC(id)) assert.Equal(t, expHash, id.Hash())