From ce6d1636274a69740a6cdc59d27fb0fadaad6c7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Mur=C3=A9?= Date: Wed, 11 Dec 2024 16:05:16 +0100 Subject: [PATCH] container: I/O as strings for base64 --- pkg/container/reader.go | 9 +++++---- pkg/container/writer.go | 12 ++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkg/container/reader.go b/pkg/container/reader.go index f54846e..b9e1e98 100644 --- a/pkg/container/reader.go +++ b/pkg/container/reader.go @@ -7,6 +7,7 @@ import ( "fmt" "io" "iter" + "strings" "github.com/ipfs/go-cid" "github.com/ipld/go-ipld-prime" @@ -151,8 +152,8 @@ func FromCborReader(r io.Reader) (Reader, error) { } // FromCborBase64 decodes a base64 DAG-CBOR encoded container. -func FromCborBase64(data []byte) (Reader, error) { - return FromCborBase64Reader(bytes.NewReader(data)) +func FromCborBase64(data string) (Reader, error) { + return FromCborBase64Reader(strings.NewReader(data)) } // FromCborBase64Reader is the same as FromCborBase64, but with an io.Reader. @@ -189,8 +190,8 @@ func FromCarReader(r io.Reader) (Reader, error) { } // FromCarBase64 decodes a base64 CAR file encoded container. -func FromCarBase64(data []byte) (Reader, error) { - return FromCarReader(bytes.NewReader(data)) +func FromCarBase64(data string) (Reader, error) { + return FromCarReader(strings.NewReader(data)) } // FromCarBase64Reader is the same as FromCarBase64, but with an io.Reader. diff --git a/pkg/container/writer.go b/pkg/container/writer.go index 7f70f5f..75b6fcf 100644 --- a/pkg/container/writer.go +++ b/pkg/container/writer.go @@ -53,13 +53,13 @@ func (ctn Writer) ToCborWriter(w io.Writer) error { } // ToCborBase64 encode the container into a base64 encoded DAG-CBOR binary format. -func (ctn Writer) ToCborBase64() ([]byte, error) { +func (ctn Writer) ToCborBase64() (string, error) { var buf bytes.Buffer err := ctn.ToCborBase64Writer(&buf) if err != nil { - return nil, err + return "", err } - return buf.Bytes(), nil + return buf.String(), nil } // ToCborBase64Writer is the same as ToCborBase64, but with an io.Writer. @@ -91,13 +91,13 @@ func (ctn Writer) ToCarWriter(w io.Writer) error { } // ToCarBase64 encode the container into a base64 encoded CAR file. -func (ctn Writer) ToCarBase64() ([]byte, error) { +func (ctn Writer) ToCarBase64() (string, error) { var buf bytes.Buffer err := ctn.ToCarBase64Writer(&buf) if err != nil { - return nil, err + return "", err } - return buf.Bytes(), nil + return buf.String(), nil } // ToCarBase64Writer is the same as ToCarBase64, but with an io.Writer.