fix: error not as pointer

feat: wrap parsing errors into ErrInvalidCid
2023-03-17 11:05:58 +11:00 · 2023-03-16 08:44:03 +01:00
25 changed files with 241 additions and 285 deletions
--- a/.github/Repo.toml
+++ b/.github/Repo.toml
@@ -1,7 +0,0 @@
-[scopes]
-ci = [".github/workflows"]
-config = [".github", "codecov.yml", "go.mod", "go.sum", "Makefile", "version.json"]
-docs = ["README.md", "LICENSE"]
-tests = ["*_test.go", "fuzz-data"]
-research = ["_rsrch"]
-core = ["cid.go", "builder.go", "set.go", "varint.go", "cid_fuzz.go", "deprecated.go"]
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,8 +0,0 @@
-version: 2
-updates:
- package-ecosystem: gomod
-  directory: "/"
-  schedule:
-    interval: weekly
-    time: "11:00"
-  open-pull-requests-limit: 10
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -0,0 +1,11 @@
+# File managed by web3-bot. DO NOT EDIT.
+# See https://github.com/protocol/.github/ for details.
+
+name: Automerge
+on: [ pull_request ]
+
+jobs:
+  automerge:
+    uses: protocol/.github/.github/workflows/automerge.yml@master
+    with:
+      job: 'automerge'
--- a/.github/workflows/generated-pr.yml
+++ b/.github/workflows/generated-pr.yml
@@ -1,14 +0,0 @@
-name: Close Generated PRs
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-
-permissions:
-  issues: write
-  pull-requests: write
-
-jobs:
-  stale:
-    uses: ipdxco/unified-github-workflows/.github/workflows/reusable-generated-pr.yml@v1
--- a/.github/workflows/go-check.yml
+++ b/.github/workflows/go-check.yml
@@ -1,18 +1,67 @@
+# File managed by web3-bot. DO NOT EDIT.
+# See https://github.com/protocol/.github/ for details.
+
+on: [push, pull_request]
 name: Go Checks

-on:
-  pull_request:
-  push:
-    branches: ["master"]
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event_name == 'push' && github.sha || github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  go-check:
-    uses: ipdxco/unified-github-workflows/.github/workflows/go-check.yml@v1.0
+  unit:
+    runs-on: ubuntu-latest
+    name: All
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - id: config
+        uses: protocol/.github/.github/actions/read-config@master
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.20.x
+      - name: Run repo-specific setup
+        uses: ./.github/actions/go-check-setup
+        if: hashFiles('./.github/actions/go-check-setup') != ''
+      - name: Install staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@4970552d932f48b71485287748246cf3237cebdf # 2023.1 (v0.4.0)
+      - name: Check that go.mod is tidy
+        uses: protocol/multiple-go-modules@v1.2
+        with:
+          run: |
+            go mod tidy
+            if [[ -n $(git ls-files --other --exclude-standard --directory -- go.sum) ]]; then
+              echo "go.sum was added by go mod tidy"
+              exit 1
+            fi
+            git diff --exit-code -- go.sum go.mod
+      - name: gofmt
+        if: success() || failure() # run this step even if the previous one failed
+        run: |
+          out=$(gofmt -s -l .)
+          if [[ -n "$out" ]]; then
+            echo $out | awk '{print "::error file=" $0 ",line=0,col=0::File is not gofmt-ed."}'
+            exit 1
+          fi
+      - name: go vet
+        if: success() || failure() # run this step even if the previous one failed
+        uses: protocol/multiple-go-modules@v1.2
+        with:
+          run: go vet ./...
+      - name: staticcheck
+        if: success() || failure() # run this step even if the previous one failed
+        uses: protocol/multiple-go-modules@v1.2
+        with:
+          run: |
+            set -o pipefail
+            staticcheck ./... | sed -e 's@\(.*\)\.go@./\1.go@g'
+      - name: go generate
+        uses: protocol/multiple-go-modules@v1.2
+        if: (success() || failure()) && fromJSON(steps.config.outputs.json).gogenerate == true
+        with:
+          run: |
+            git clean -fd # make sure there aren't untracked files / directories
+            go generate -x ./...
+            # check if go generate modified or added any files
+            if ! $(git add . && git diff-index HEAD --exit-code --quiet); then
+              echo "go generated caused changes to the repository:"
+              git status --short
+              exit 1
+            fi
--- a/.github/workflows/go-test.yml
+++ b/.github/workflows/go-test.yml
@@ -1,20 +1,76 @@
+# File managed by web3-bot. DO NOT EDIT.
+# See https://github.com/protocol/.github/ for details.
+
+on: [push, pull_request]
 name: Go Test

-on:
-  pull_request:
-  push:
-    branches: ["master"]
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event_name == 'push' && github.sha || github.ref }}
-  cancel-in-progress: true
-
 jobs:
-  go-test:
-    uses: ipdxco/unified-github-workflows/.github/workflows/go-test.yml@v1.0
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+  unit:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ "ubuntu", "windows", "macos" ]
+        go: ["1.19.x","1.20.x"]
+    env:
+      COVERAGES: ""
+    runs-on: ${{ fromJSON(vars[format('UCI_GO_TEST_RUNNER_{0}', matrix.os)] || format('"{0}-latest"', matrix.os)) }}
+    name: ${{ matrix.os }} (go ${{ matrix.go }})
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - id: config
+        uses: protocol/.github/.github/actions/read-config@master
+      - uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go }}
+      - name: Go information
+        run: |
+          go version
+          go env
+      - name: Use msys2 on windows
+        if: matrix.os == 'windows'
+        shell: bash
+        # The executable for msys2 is also called bash.cmd
+        #   https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md#shells
+        # If we prepend its location to the PATH
+        #   subsequent 'shell: bash' steps will use msys2 instead of gitbash
+        run: echo "C:/msys64/usr/bin" >> $GITHUB_PATH
+      - name: Run repo-specific setup
+        uses: ./.github/actions/go-test-setup
+        if: hashFiles('./.github/actions/go-test-setup') != ''
+      - name: Run tests
+        if: contains(fromJSON(steps.config.outputs.json).skipOSes, matrix.os) == false
+        uses: protocol/multiple-go-modules@v1.2
+        with:
+          # Use -coverpkg=./..., so that we include cross-package coverage.
+          # If package ./A imports ./B, and ./A's tests also cover ./B,
+          # this means ./B's coverage will be significantly higher than 0%.
+          run: go test -v -shuffle=on -coverprofile=module-coverage.txt -coverpkg=./... ./...
+      - name: Run tests (32 bit)
+        # can't run 32 bit tests on OSX.
+        if: matrix.os != 'macos' &&
+          fromJSON(steps.config.outputs.json).skip32bit != true &&
+          contains(fromJSON(steps.config.outputs.json).skipOSes, matrix.os) == false
+        uses: protocol/multiple-go-modules@v1.2
+        env:
+          GOARCH: 386
+        with:
+          run: |
+            export "PATH=$PATH_386:$PATH"
+            go test -v -shuffle=on ./...
+      - name: Run tests with race detector
+        # speed things up. Windows and OSX VMs are slow
+        if: matrix.os == 'ubuntu' &&
+          contains(fromJSON(steps.config.outputs.json).skipOSes, matrix.os) == false
+        uses: protocol/multiple-go-modules@v1.2
+        with:
+          run: go test -v -race ./...
+      - name: Collect coverage files
+        shell: bash
+        run: echo "COVERAGES=$(find . -type f -name 'module-coverage.txt' | tr -s '\n' ',' | sed 's/,$//')" >> $GITHUB_ENV
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@d9f34f8cd5cb3b3eb79b3e4b5dae3a16df499a70 # v3.1.1
+        with:
+          files: '${{ env.COVERAGES }}'
+          env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }}
--- a/.github/workflows/release-check.yml
+++ b/.github/workflows/release-check.yml
@@ -1,19 +1,13 @@
-name: Release Checker
+# File managed by web3-bot. DO NOT EDIT.
+# See https://github.com/protocol/.github/ for details.

+name: Release Checker
 on:
  pull_request_target:
    paths: [ 'version.json' ]
-    types: [ opened, synchronize, reopened, labeled, unlabeled ]
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  pull-requests: write
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true

 jobs:
  release-check:
-    uses: ipdxco/unified-github-workflows/.github/workflows/release-check.yml@v1.0
+    uses: protocol/.github/.github/workflows/release-check.yml@master
+    with:
+      go-version: 1.20.x
--- a/.github/workflows/releaser.yml
+++ b/.github/workflows/releaser.yml
@@ -1,17 +1,11 @@
-name: Releaser
+# File managed by web3-bot. DO NOT EDIT.
+# See https://github.com/protocol/.github/ for details.

+name: Releaser
 on:
  push:
    paths: [ 'version.json' ]
-  workflow_dispatch:
-
-permissions:
-  contents: write
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.sha }}
-  cancel-in-progress: true

 jobs:
  releaser:
-    uses: ipdxco/unified-github-workflows/.github/workflows/releaser.yml@v1.0
+    uses: protocol/.github/.github/workflows/releaser.yml@master
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,14 +1,26 @@
-name: Close Stale Issues
+name: Close and mark stale issue

 on:
  schedule:
-    - cron: '0 0 * * *'
-  workflow_dispatch:
-
-permissions:
-  issues: write
-  pull-requests: write
+  - cron: '0 0 * * *'

 jobs:
  stale:
-    uses: ipdxco/unified-github-workflows/.github/workflows/reusable-stale-issue.yml@v1
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Oops, seems like we needed more information for this issue, please comment with more details or this issue will be closed in 7 days.'
+        close-issue-message: 'This issue was closed because it is missing author input.'
+        stale-issue-label: 'kind/stale'
+        any-of-labels: 'need/author-input'
+        exempt-issue-labels: 'need/triage,need/community-input,need/maintainer-input,need/maintainers-input,need/analysis,status/blocked,status/in-progress,status/ready,status/deferred,status/inactive'
+        days-before-issue-stale: 6
+        days-before-issue-close: 7
+        enable-statistics: true
--- a/.github/workflows/tagpush.yml
+++ b/.github/workflows/tagpush.yml
@@ -1,18 +1,12 @@
-name: Tag Push Checker
+# File managed by web3-bot. DO NOT EDIT.
+# See https://github.com/protocol/.github/ for details.

+name: Tag Push Checker
 on:
  push:
    tags:
      - v*

-permissions:
-  contents: read
-  issues: write
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
  releaser:
-    uses: ipdxco/unified-github-workflows/.github/workflows/tagpush.yml@v1.0
+    uses: protocol/.github/.github/workflows/tagpush.yml@master
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ go-cid
 [![](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.io/)
 [![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
 [![](https://img.shields.io/badge/readme%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
-[![GoDoc](https://godoc.org/code.sonr.org/go/cid?status.svg)](https://godoc.org/code.sonr.org/go/cid)
+[![GoDoc](https://godoc.org/github.com/ipfs/go-cid?status.svg)](https://godoc.org/github.com/ipfs/go-cid)
 [![Coverage Status](https://coveralls.io/repos/github/ipfs/go-cid/badge.svg?branch=master)](https://coveralls.io/github/ipfs/go-cid?branch=master)
 [![Travis CI](https://travis-ci.org/ipfs/go-cid.svg?branch=master)](https://travis-ci.org/ipfs/go-cid)

@@ -31,7 +31,7 @@ It is used in `go-ipfs` and related packages to refer to a typed hunk of data.
 `go-cid` is a standard Go module which can be installed with:

 ```sh
-go get code.sonr.org/go/cid
+go get github.com/ipfs/go-cid
 ```

 ## Usage
@@ -61,7 +61,7 @@ fmt.Println("Got CID: ", c)
 ```go

 import (
-  cid "code.sonr.org/go/cid"
+  cid "github.com/ipfs/go-cid"
  mc "github.com/multiformats/go-multicodec"
  mh "github.com/multiformats/go-multihash"
 )
--- a/_rsrch/internal/cidiface/README.md
+++ b/_rsrch/internal/cidiface/README.md
--- a/_rsrch/internal/cidiface/cid.go
+++ b/_rsrch/internal/cidiface/cid.go
--- a/_rsrch/internal/cidiface/cidBoxingBench_test.go
+++ b/_rsrch/internal/cidiface/cidBoxingBench_test.go
--- a/_rsrch/internal/cidiface/cidString.go
+++ b/_rsrch/internal/cidiface/cidString.go
--- a/_rsrch/internal/cidiface/cidStruct.go
+++ b/_rsrch/internal/cidiface/cidStruct.go
--- a/_rsrch/internal/cidiface/enums.go
+++ b/_rsrch/internal/cidiface/enums.go
--- a/_rsrch/internal/cidiface/errors.go
+++ b/_rsrch/internal/cidiface/errors.go
--- a/_rsrch/internal/cidiface/misc.go
+++ b/_rsrch/internal/cidiface/misc.go
--- a/benchmark_test.go
+++ b/benchmark_test.go
@@ -4,7 +4,7 @@ import (
 	"math/rand"
 	"testing"

-	"code.sonr.org/go/cid"
+	"github.com/ipfs/go-cid"
 	"github.com/multiformats/go-multihash"
 )

--- a/cid.go
+++ b/cid.go
@@ -70,7 +70,7 @@ var (
 )

 // Consts below are DEPRECATED and left only for legacy reasons:
-// <https://code.sonr.org/go/cid/pull/137>
+// <https://github.com/ipfs/go-cid/pull/137>
 // Modern code should use consts from go-multicodec instead:
 // <https://github.com/multiformats/go-multicodec>
 const (
@@ -456,7 +456,7 @@ func (c Cid) Equals(o Cid) bool {
 // UnmarshalJSON parses the JSON representation of a Cid.
 func (c *Cid) UnmarshalJSON(b []byte) error {
 	if len(b) < 2 {
-		return ErrInvalidCid{fmt.Errorf("invalid cid json blob")}
+		return fmt.Errorf("invalid cid json blob")
 	}
 	obj := struct {
 		CidTarget string `json:"/"`
@@ -464,7 +464,7 @@ func (c *Cid) UnmarshalJSON(b []byte) error {
 	objptr := &obj
 	err := json.Unmarshal(b, &objptr)
 	if err != nil {
-		return ErrInvalidCid{err}
+		return err
 	}
 	if objptr == nil {
 		*c = Cid{}
@@ -472,12 +472,12 @@ func (c *Cid) UnmarshalJSON(b []byte) error {
 	}

 	if obj.CidTarget == "" {
-		return ErrInvalidCid{fmt.Errorf("cid was incorrectly formatted")}
+		return fmt.Errorf("cid was incorrectly formatted")
 	}

 	out, err := Decode(obj.CidTarget)
 	if err != nil {
-		return ErrInvalidCid{err}
+		return err
 	}

 	*c = out
@@ -564,12 +564,12 @@ func (p Prefix) Sum(data []byte) (Cid, error) {
 	if p.Version == 0 && (p.MhType != mh.SHA2_256 ||
 		(p.MhLength != 32 && p.MhLength != -1)) {

-		return Undef, ErrInvalidCid{fmt.Errorf("invalid v0 prefix")}
+		return Undef, fmt.Errorf("invalid v0 prefix")
 	}

 	hash, err := mh.Sum(data, p.MhType, length)
 	if err != nil {
-		return Undef, ErrInvalidCid{err}
+		return Undef, err
 	}

 	switch p.Version {
@@ -578,7 +578,7 @@ func (p Prefix) Sum(data []byte) (Cid, error) {
 	case 1:
 		return NewCidV1(p.Codec, hash), nil
 	default:
-		return Undef, ErrInvalidCid{fmt.Errorf("invalid cid version")}
+		return Undef, fmt.Errorf("invalid cid version")
 	}
 }

@@ -608,22 +608,22 @@ func PrefixFromBytes(buf []byte) (Prefix, error) {
 	r := bytes.NewReader(buf)
 	vers, err := varint.ReadUvarint(r)
 	if err != nil {
-		return Prefix{}, ErrInvalidCid{err}
+		return Prefix{}, err
 	}

 	codec, err := varint.ReadUvarint(r)
 	if err != nil {
-		return Prefix{}, ErrInvalidCid{err}
+		return Prefix{}, err
 	}

 	mhtype, err := varint.ReadUvarint(r)
 	if err != nil {
-		return Prefix{}, ErrInvalidCid{err}
+		return Prefix{}, err
 	}

 	mhlen, err := varint.ReadUvarint(r)
 	if err != nil {
-		return Prefix{}, ErrInvalidCid{err}
+		return Prefix{}, err
 	}

 	return Prefix{
@@ -717,9 +717,6 @@ func (r *bufByteReader) ReadByte() (byte, error) {
 // It's recommended to supply a reader that buffers and implements io.ByteReader,
 // as CidFromReader has to do many single-byte reads to decode varints.
 // If the argument only implements io.Reader, single-byte Read calls are used instead.
-//
-// If the Reader is found to yield zero bytes, an io.EOF error is returned directly, in all
-// other error cases, an ErrInvalidCid, wrapping the original error, is returned.
 func CidFromReader(r io.Reader) (int, Cid, error) {
 	// 64 bytes is enough for any CIDv0,
 	// and it's enough for most CIDv1s in practice.
@@ -730,11 +727,6 @@ func CidFromReader(r io.Reader) (int, Cid, error) {
 	// The varint package wants a io.ByteReader, so we must wrap our io.Reader.
 	vers, err := varint.ReadUvarint(br)
 	if err != nil {
-		if err == io.EOF {
-			// First-byte read in ReadUvarint errors with io.EOF, so reader has no data.
-			// Subsequent reads with an EOF will return io.ErrUnexpectedEOF and be wrapped here.
-			return 0, Undef, err
-		}
 		return len(br.dst), Undef, ErrInvalidCid{err}
 	}

--- a/cid_test.go
+++ b/cid_test.go
@@ -33,7 +33,7 @@ func assertEqual(t *testing.T, a, b Cid) {

 func TestPrefixSum(t *testing.T) {
 	// Test creating CIDs both manually and with Prefix.
-	// Tests: https://code.sonr.org/go/cid/issues/83
+	// Tests: https://github.com/ipfs/go-cid/issues/83
 	for _, hashfun := range []uint64{
 		mh.IDENTITY, mh.SHA3, mh.SHA2_256,
 	} {
@@ -163,9 +163,6 @@ func TestBasesMarshaling(t *testing.T) {
 	if err == nil {
 		t.Fatal("expected too-short error from ExtractEncoding")
 	}
-	if !errors.Is(err, ErrInvalidCid{}) {
-		t.Fatal("expected error to be ErrInvalidCid")
-	}
 	if ee != -1 {
 		t.Fatal("expected -1 from too-short ExtractEncoding")
 	}
@@ -382,9 +379,6 @@ func TestInvalidV0Prefix(t *testing.T) {
 		if err == nil {
 			t.Fatalf("should error (index %d)", i)
 		}
-		if !errors.Is(err, ErrInvalidCid{}) {
-			t.Fatal("expected error to be ErrInvalidCid")
-		}
 	}
 }

@@ -394,9 +388,6 @@ func TestBadPrefix(t *testing.T) {
 	if err == nil {
 		t.Fatalf("expected error on v3 prefix Sum")
 	}
-	if !errors.Is(err, ErrInvalidCid{}) {
-		t.Fatal("expected error to be ErrInvalidCid")
-	}
 }

 func TestPrefixRoundtrip(t *testing.T) {
@@ -433,30 +424,18 @@ func TestBadPrefixFromBytes(t *testing.T) {
 	if err == nil {
 		t.Fatal("expected error for bad byte 0")
 	}
-	if !errors.Is(err, ErrInvalidCid{}) {
-		t.Fatal("expected error to be ErrInvalidCid")
-	}
 	_, err = PrefixFromBytes([]byte{0x01, 0x80})
 	if err == nil {
 		t.Fatal("expected error for bad byte 1")
 	}
-	if !errors.Is(err, ErrInvalidCid{}) {
-		t.Fatal("expected error to be ErrInvalidCid")
-	}
 	_, err = PrefixFromBytes([]byte{0x01, 0x01, 0x80})
 	if err == nil {
 		t.Fatal("expected error for bad byte 2")
 	}
-	if !errors.Is(err, ErrInvalidCid{}) {
-		t.Fatal("expected error to be ErrInvalidCid")
-	}
 	_, err = PrefixFromBytes([]byte{0x01, 0x01, 0x01, 0x80})
 	if err == nil {
 		t.Fatal("expected error for bad byte 3")
 	}
-	if !errors.Is(err, ErrInvalidCid{}) {
-		t.Fatal("expected error to be ErrInvalidCid")
-	}
 }

 func Test16BytesVarint(t *testing.T) {
@@ -603,29 +582,17 @@ func TestJsonRoundTrip(t *testing.T) {
 		t.Fatal("cids not equal for Cid")
 	}

-	err = actual2.UnmarshalJSON([]byte("1"))
-	if err == nil {
+	if err = actual2.UnmarshalJSON([]byte("1")); err == nil {
 		t.Fatal("expected error for too-short JSON")
 	}
-	if !errors.Is(err, ErrInvalidCid{}) {
-		t.Fatal("expected error to be ErrInvalidCid")
-	}

-	err = actual2.UnmarshalJSON([]byte(`{"nope":"nope"}`))
-	if err == nil {
+	if err = actual2.UnmarshalJSON([]byte(`{"nope":"nope"}`)); err == nil {
 		t.Fatal("expected error for bad CID JSON")
 	}
-	if !errors.Is(err, ErrInvalidCid{}) {
-		t.Fatal("expected error to be ErrInvalidCid")
-	}

-	err = actual2.UnmarshalJSON([]byte(`bad "" json!`))
-	if err == nil {
+	if err = actual2.UnmarshalJSON([]byte(`bad "" json!`)); err == nil {
 		t.Fatal("expected error for bad JSON")
 	}
-	if !errors.Is(err, ErrInvalidCid{}) {
-		t.Fatal("expected error to be ErrInvalidCid")
-	}

 	var actual3 Cid
 	enc, err = actual3.MarshalJSON()
@@ -783,30 +750,6 @@ func TestBadCidInput(t *testing.T) {
 	}
 }

-func TestFromReaderNoData(t *testing.T) {
-	// Reading no data from io.Reader should return io.EOF, not ErrInvalidCid.
-	n, cid, err := CidFromReader(bytes.NewReader(nil))
-	if err != io.EOF {
-		t.Fatal("Expected io.EOF error")
-	}
-	if cid != Undef {
-		t.Fatal("Expected Undef CID")
-	}
-	if n != 0 {
-		t.Fatal("Expected 0 data")
-	}
-
-	// Read byte indicatiing more data to and check error is ErrInvalidCid.
-	_, _, err = CidFromReader(bytes.NewReader([]byte{0x80}))
-	if !errors.Is(err, ErrInvalidCid{}) {
-		t.Fatal("Expected ErrInvalidCid error")
-	}
-	// Check for expected wrapped error.
-	if !errors.Is(err, io.ErrUnexpectedEOF) {
-		t.Fatal("Expected error", io.ErrUnexpectedEOF)
-	}
-}
-
 func TestBadParse(t *testing.T) {
 	hash, err := mh.Sum([]byte("foobar"), mh.SHA3_256, -1)
 	if err != nil {
@@ -834,79 +777,14 @@ func TestLoggable(t *testing.T) {
 	}
 }

-func TestErrInvalidCidIs(t *testing.T) {
-	for i, test := range []struct {
-		err    error
-		target error
-	}{
-		{&ErrInvalidCid{}, ErrInvalidCid{}},
-		{ErrInvalidCid{}, &ErrInvalidCid{}},
-		{ErrInvalidCid{}, ErrInvalidCid{}},
-		{&ErrInvalidCid{}, &ErrInvalidCid{}},
-	} {
-		if !errors.Is(test.err, test.target) {
-			t.Fatalf("expected error to be ErrInvalidCid, case %d", i)
-		}
-	}
-}
-
 func TestErrInvalidCid(t *testing.T) {
-	run := func(err error) {
-		if err == nil {
-			t.Fatal("expected error")
-		}
-
-		if !strings.HasPrefix(err.Error(), "invalid cid: ") {
-			t.Fatal(`expected error message to contain "invalid cid: "`)
-		}
-
-		is := errors.Is(err, ErrInvalidCid{})
-		if !is {
-			t.Fatal("expected error to be ErrInvalidCid")
-		}
-
-		if !errors.Is(err, &ErrInvalidCid{}) {
-			t.Fatal("expected error to be &ErrInvalidCid")
-		}
+	_, err := Decode("not-a-cid")
+	if err == nil {
+		t.Fatal("expected error")
 	}

-	_, err := Decode("")
-	run(err)
-
-	_, err = Decode("not-a-cid")
-	run(err)
-
-	_, err = Decode("bafyInvalid")
-	run(err)
-
-	_, err = Decode("QmdfTbBqBPQ7VNxZEYEj14VmRuZBkqFbiwReogJgS1zIII")
-	run(err)
-
-	_, err = Cast([]byte("invalid"))
-	run(err)
-
-	_, err = Parse("not-a-cid")
-	run(err)
-
-	_, err = Parse("bafyInvalid")
-	run(err)
-
-	_, err = Parse("QmdfTbBqBPQ7VNxZEYEj14VmRuZBkqFbiwReogJgS1zIII")
-	run(err)
-
-	_, err = Parse(123)
-	run(err)
-
-	_, _, err = CidFromBytes([]byte("invalid"))
-	run(err)
-
-	_, err = Prefix{}.Sum([]byte("data"))
-	run(err)
-
-	_, err = PrefixFromBytes([]byte{0x80})
-	run(err)
-
-	_, err = ExtractEncoding("invalid ")
-	run(err)
-
+	is := errors.Is(err, ErrInvalidCid{})
+	if !is {
+		t.Fatal("expected error to be ErrInvalidCid")
+	}
 }
--- a/go.mod
+++ b/go.mod
@@ -1,21 +1,20 @@
-module code.sonr.org/go/cid
+module github.com/ipfs/go-cid

 require (
-	github.com/multiformats/go-multibase v0.2.0
-	github.com/multiformats/go-multihash v0.2.3
-	github.com/multiformats/go-varint v0.1.0
+	github.com/multiformats/go-multibase v0.0.3
+	github.com/multiformats/go-multihash v0.0.15
+	github.com/multiformats/go-varint v0.0.6
 )

 require (
-	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.4 // indirect
+	github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect
 	github.com/minio/sha256-simd v1.0.0 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/multiformats/go-base32 v0.0.3 // indirect
 	github.com/multiformats/go-base36 v0.1.0 // indirect
-	github.com/spaolacci/murmur3 v1.1.0 // indirect
-	golang.org/x/crypto v0.45.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	lukechampine.com/blake3 v1.1.6 // indirect
+	golang.org/x/crypto v0.1.0 // indirect
+	golang.org/x/sys v0.1.0 // indirect
 )

-go 1.24.0
+go 1.19
--- a/go.sum
+++ b/go.sum
@@ -1,25 +1,31 @@
+github.com/klauspost/cpuid/v2 v2.0.4 h1:g0I61F2K2DjRHz1cnxlkNSBIaePVoJIjjnHui8QHbiw=
 github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
+github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
 github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g=
 github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM=
+github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
 github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp8Nq/kkI=
 github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA=
 github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4=
 github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM=
-github.com/multiformats/go-multibase v0.2.0 h1:isdYCVLvksgWlMW9OZRYJEa9pZETFivncJHmHnnd87g=
-github.com/multiformats/go-multibase v0.2.0/go.mod h1:bFBZX4lKCA/2lyOFSAoKH5SS6oPyjtnzK/XTFDPkNuk=
-github.com/multiformats/go-multihash v0.2.3 h1:7Lyc8XfX/IY2jWb/gI7JP+o7JEq9hOa7BFvVU9RSh+U=
-github.com/multiformats/go-multihash v0.2.3/go.mod h1:dXgKXCXjBzdscBLk9JkjINiEsCKRVch90MdaGiKsvSM=
-github.com/multiformats/go-varint v0.1.0 h1:i2wqFp4sdl3IcIxfAonHQV9qU5OsZ4Ts9IOoETFs5dI=
-github.com/multiformats/go-varint v0.1.0/go.mod h1:5KVAVXegtfmNQQm/lCY+ATvDzvJJhSkUlGQV9wgObdI=
-github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
-github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
-golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-lukechampine.com/blake3 v1.1.6 h1:H3cROdztr7RCfoaTpGZFQsrqvweFLrqS73j7L7cmR5c=
-lukechampine.com/blake3 v1.1.6/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA=
+github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk=
+github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc=
+github.com/multiformats/go-multihash v0.0.15 h1:hWOPdrNqDjwHDx82vsYGSDZNyktOJJ2dzZJzFkOV1jM=
+github.com/multiformats/go-multihash v0.0.15/go.mod h1:D6aZrWNLFTV/ynMpKsNtB40mJzmCl4jb1alC0OvHiHg=
+github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY=
+github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
+golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
--- a/version.json
+++ b/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "v0.6.0"
+  "version": "v0.3.2"
 }
Author	SHA1	Message	Date
Rod Vagg	fc27a0c8a4	fix: error not as pointer	2023-03-17 11:05:58 +11:00
Henrique Dias	65e3baa1cb	feat: wrap parsing errors into ErrInvalidCid	2023-03-16 08:44:03 +01:00