feat(cid): add FromDigest for previously computed hash

.github/workflows/automerge.yml

@@ -1,11 +0,0 @@
-# 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'

.github/workflows/go-check.yml

@@ -1,73 +0,0 @@
-# File managed by web3-bot. DO NOT EDIT.
-# See https://github.com/protocol/.github/ for details.
-
-on: [push, pull_request]
-name: Go Checks
-
-jobs:
-  unit:
-    runs-on: ubuntu-latest
-    name: All
-    env:
-      RUNGOGENERATE: false
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - uses: actions/setup-go@v2
-        with:
-          go-version: "1.18.x"
-      - name: Run repo-specific setup
-        uses: ./.github/actions/go-check-setup
-        if: hashFiles('./.github/actions/go-check-setup') != ''
-      - name: Read config
-        if: hashFiles('./.github/workflows/go-check-config.json') != ''
-        run: |
-          if jq -re .gogenerate ./.github/workflows/go-check-config.json; then
-            echo "RUNGOGENERATE=true" >> $GITHUB_ENV
-          fi
-      - name: Install staticcheck
-        run: go install honnef.co/go/tools/cmd/staticcheck@d7e217c1ff411395475b2971c0824e1e7cc1af98 # 2022.1 (v0.3.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()) && env.RUNGOGENERATE == 'true'
-        with:
-          run: |
-            git clean -fd # make sure there aren't untracked files / directories
-            go generate ./...
-            # 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

.github/workflows/go-test.yml

@@ -1,68 +0,0 @@
-# File managed by web3-bot. DO NOT EDIT.
-# See https://github.com/protocol/.github/ for details.
-
-on: [push, pull_request]
-name: Go Test
-
-jobs:
-  unit:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ "ubuntu", "windows", "macos" ]
-        go: [ "1.17.x", "1.18.x" ]
-    env:
-      COVERAGES: ""
-    runs-on: ${{ format('{0}-latest', matrix.os) }}
-    name: ${{ matrix.os }} (go ${{ matrix.go }})
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - uses: actions/setup-go@v2
-        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
-        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 -coverprofile=module-coverage.txt -coverpkg=./... ./...
-      - name: Run tests (32 bit)
-        if: ${{ matrix.os != 'macos' }} # can't run 32 bit tests on OSX.
-        uses: protocol/multiple-go-modules@v1.2
-        env:
-          GOARCH: 386
-        with:
-          run: |
-            export "PATH=${{ env.PATH_386 }}:$PATH"
-            go test -v ./...
-      - name: Run tests with race detector
-        if: ${{ matrix.os == 'ubuntu' }} # speed things up. Windows and OSX VMs are slow
-        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@f32b3a3741e1053eb607407145bc9619351dc93b # v2.1.0
-        with:
-          files: '${{ env.COVERAGES }}'
-          env_vars: OS=${{ matrix.os }}, GO=${{ matrix.go }}

.github/workflows/release-check.yml

@@ -1,11 +0,0 @@
-# File managed by web3-bot. DO NOT EDIT.
-# See https://github.com/protocol/.github/ for details.
-
-name: Release Checker
-on:
-  pull_request:
-    paths: [ 'version.json' ]
-
-jobs:
-  release-check:
-    uses: protocol/.github/.github/workflows/release-check.yml@master

.github/workflows/releaser.yml

@@ -1,11 +0,0 @@
-# File managed by web3-bot. DO NOT EDIT.
-# See https://github.com/protocol/.github/ for details.
-
-name: Releaser
-on:
-  push:
-    paths: [ 'version.json' ]
-
-jobs:
-  releaser:
-    uses: protocol/.github/.github/workflows/releaser.yml@master

.github/workflows/stale.yml

@@ -1,26 +0,0 @@
-name: Close and mark stale issue
-
-on:
-  schedule:
-  - cron: '0 0 * * *'
-
-jobs:
-  stale:
-
-    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

.github/workflows/tagpush.yml

@@ -1,12 +0,0 @@
-# File managed by web3-bot. DO NOT EDIT.
-# See https://github.com/protocol/.github/ for details.
-
-name: Tag Push Checker
-on:
-  push:
-    tags:
-      - v*
-
-jobs:
-  releaser:
-    uses: protocol/.github/.github/workflows/tagpush.yml@master

.travis.yml

@@ -0,0 +1,30 @@
+os:
+  - linux
+
+language: go
+
+go:
+  - 1.11.x
+
+env:
+  global:
+    - GOTFLAGS="-race"
+  matrix:
+    - BUILD_DEPTYPE=gomod
+
+
+# disable travis install
+install:
+  - true
+
+script:
+  - bash <(curl -s https://raw.githubusercontent.com/ipfs/ci-helpers/master/travis-ci/run-standard-tests.sh)
+
+
+cache:
+  directories:
+    - $GOPATH/pkg/mod
+    - $HOME/.cache/go-build
+
+notifications:
+  email: false

README.md

@@ -59,17 +59,10 @@ fmt.Println("Got CID: ", c)
 #### Creating a CID from scratch
 
 ```go
-
-import (
-  cid "github.com/ipfs/go-cid"
-  mc "github.com/multiformats/go-multicodec"
-  mh "github.com/multiformats/go-multihash"
-)
-
 // Create a cid manually by specifying the 'prefix' parameters
 pref := cid.Prefix{
 	Version: 1,
-	Codec: mc.Raw,
+	Codec: cid.Raw,
 	MhType: mh.SHA2_256,
 	MhLength: -1, // default length
 }

benchmark_test.go

@@ -1,61 +0,0 @@
-package cid_test
-
-import (
-	"math/rand"
-	"testing"
-
-	"github.com/ipfs/go-cid"
-	"github.com/multiformats/go-multihash"
-)
-
-// BenchmarkIdentityCheck benchmarks two ways of checking whether a CIDv1 has multihash.IDENTITY
-// code:
-//  1. Cid.Prefix(), and
-//  2. decoding the Cid.Hash().
-//
-// This benchmark illustrates that using Cid.Prefix is more efficient than multihash.Decode.
-// Users wishing to perform such a check should use Cid.Prefix.
-//
-// Consider that `Cid.Prefix` is already efficient enough and introducing a dedicated API for
-// performing this check will likely result in small gains.
-func BenchmarkIdentityCheck(b *testing.B) {
-	rng := rand.New(rand.NewSource(1413))
-
-	data := make([]byte, rng.Intn(100)+1024)
-	if _, err := rng.Read(data); err != nil {
-		b.Fatal(err)
-	}
-	mh, err := multihash.Sum(data, multihash.IDENTITY, -1)
-	if err != nil {
-		b.Fatal(err)
-	}
-	cv1 := cid.NewCidV1(cid.Raw, mh)
-
-	b.SetBytes(int64(cv1.ByteLen()))
-	b.ReportAllocs()
-	b.ResetTimer()
-
-	b.Run("Prefix", func(b *testing.B) {
-		b.RunParallel(func(pb *testing.PB) {
-			for pb.Next() {
-				if cv1.Prefix().MhType != multihash.IDENTITY {
-					b.Fatal("expected IDENTITY CID")
-				}
-			}
-		})
-	})
-
-	b.Run("MultihashDecode", func(b *testing.B) {
-		b.RunParallel(func(pb *testing.PB) {
-			for pb.Next() {
-				dmh, err := multihash.Decode(cv1.Hash())
-				if err != nil {
-					b.Fatal(err)
-				}
-				if dmh.Code != multihash.IDENTITY {
-					b.Fatal("expected IDENTITY CID")
-				}
-			}
-		})
-	})
-}

cid.go

@@ -22,7 +22,6 @@ package cid
 import (
 	"bytes"
 	"encoding"
-	"encoding/binary"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -47,21 +46,19 @@ var (
 	ErrInvalidEncoding = errors.New("invalid base encoding")
 )
 
-// Consts below are DEPRECATED and left only for legacy reasons:
-// <https://github.com/ipfs/go-cid/pull/137>
-// Modern code should use consts from go-multicodec instead:
-// <https://github.com/multiformats/go-multicodec>
+// These are multicodec-packed content types. The should match
+// the codes described in the authoritative document:
+// https://github.com/multiformats/multicodec/blob/master/table.csv
 const (
-	// common ones
-	Raw         = 0x55
-	DagProtobuf = 0x70   // https://ipld.io/docs/codecs/known/dag-pb/
-	DagCBOR     = 0x71   // https://ipld.io/docs/codecs/known/dag-cbor/
-	DagJSON     = 0x0129 // https://ipld.io/docs/codecs/known/dag-json/
-	Libp2pKey   = 0x72   // https://github.com/libp2p/specs/blob/master/peer-ids/peer-ids.md#peer-ids
+	Raw = 0x55
 
-	// other
-	GitRaw                = 0x78
-	DagJOSE               = 0x85 // https://ipld.io/specs/codecs/dag-jose/spec/
+	DagProtobuf = 0x70
+	DagCBOR     = 0x71
+	Libp2pKey   = 0x72
+
+	GitRaw = 0x78
+
+	DagJOSE               = 0x85
 	EthBlock              = 0x90
 	EthBlockList          = 0x91
 	EthTxTrie             = 0x92
@@ -83,6 +80,64 @@ const (
 	FilCommitmentSealed   = 0xf102
 )
 
+// Codecs maps the name of a codec to its type
+var Codecs = map[string]uint64{
+	"v0":                      DagProtobuf,
+	"raw":                     Raw,
+	"protobuf":                DagProtobuf,
+	"cbor":                    DagCBOR,
+	"libp2p-key":              Libp2pKey,
+	"git-raw":                 GitRaw,
+	"eth-block":               EthBlock,
+	"eth-block-list":          EthBlockList,
+	"eth-tx-trie":             EthTxTrie,
+	"eth-tx":                  EthTx,
+	"eth-tx-receipt-trie":     EthTxReceiptTrie,
+	"eth-tx-receipt":          EthTxReceipt,
+	"eth-state-trie":          EthStateTrie,
+	"eth-account-snapshot":    EthAccountSnapshot,
+	"eth-storage-trie":        EthStorageTrie,
+	"bitcoin-block":           BitcoinBlock,
+	"bitcoin-tx":              BitcoinTx,
+	"zcash-block":             ZcashBlock,
+	"zcash-tx":                ZcashTx,
+	"decred-block":            DecredBlock,
+	"decred-tx":               DecredTx,
+	"dash-block":              DashBlock,
+	"dash-tx":                 DashTx,
+	"fil-commitment-unsealed": FilCommitmentUnsealed,
+	"fil-commitment-sealed":   FilCommitmentSealed,
+	"dag-jose":                DagJOSE,
+}
+
+// CodecToStr maps the numeric codec to its name
+var CodecToStr = map[uint64]string{
+	Raw:                   "raw",
+	DagProtobuf:           "protobuf",
+	DagCBOR:               "cbor",
+	GitRaw:                "git-raw",
+	EthBlock:              "eth-block",
+	EthBlockList:          "eth-block-list",
+	EthTxTrie:             "eth-tx-trie",
+	EthTx:                 "eth-tx",
+	EthTxReceiptTrie:      "eth-tx-receipt-trie",
+	EthTxReceipt:          "eth-tx-receipt",
+	EthStateTrie:          "eth-state-trie",
+	EthAccountSnapshot:    "eth-account-snapshot",
+	EthStorageTrie:        "eth-storage-trie",
+	BitcoinBlock:          "bitcoin-block",
+	BitcoinTx:             "bitcoin-tx",
+	ZcashBlock:            "zcash-block",
+	ZcashTx:               "zcash-tx",
+	DecredBlock:           "decred-block",
+	DecredTx:              "decred-tx",
+	DashBlock:             "dash-block",
+	DashTx:                "dash-tx",
+	FilCommitmentUnsealed: "fil-commitment-unsealed",
+	FilCommitmentSealed:   "fil-commitment-sealed",
+	DagJOSE:               "dag-jose",
+}
+
 // tryNewCidV0 tries to convert a multihash into a CIDv0 CID and returns an
 // error on failure.
 func tryNewCidV0(mhash mh.Multihash) (Cid, error) {
@@ -118,32 +173,22 @@ func NewCidV0(mhash mh.Multihash) Cid {
 // Panics if the multihash is invalid.
 func NewCidV1(codecType uint64, mhash mh.Multihash) Cid {
 	hashlen := len(mhash)
-
-	// Two 8 bytes (max) numbers plus hash.
-	// We use strings.Builder to only allocate once.
-	var b strings.Builder
-	b.Grow(1 + varint.UvarintSize(codecType) + hashlen)
-
-	b.WriteByte(1)
-
-	var buf [binary.MaxVarintLen64]byte
-	n := varint.PutUvarint(buf[:], codecType)
-	b.Write(buf[:n])
-
-	cn, _ := b.Write(mhash)
+	// two 8 bytes (max) numbers plus hash
+	buf := make([]byte, 1+varint.UvarintSize(codecType)+hashlen)
+	n := varint.PutUvarint(buf, 1)
+	n += varint.PutUvarint(buf[n:], codecType)
+	cn := copy(buf[n:], mhash)
 	if cn != hashlen {
 		panic("copy hash length is inconsistent")
 	}
 
-	return Cid{b.String()}
+	return Cid{string(buf[:n+hashlen])}
 }
 
-var (
-	_ encoding.BinaryMarshaler   = Cid{}
-	_ encoding.BinaryUnmarshaler = (*Cid)(nil)
-	_ encoding.TextMarshaler     = Cid{}
-	_ encoding.TextUnmarshaler   = (*Cid)(nil)
-)
+var _ encoding.BinaryMarshaler = Cid{}
+var _ encoding.BinaryUnmarshaler = (*Cid)(nil)
+var _ encoding.TextMarshaler = Cid{}
+var _ encoding.TextUnmarshaler = (*Cid)(nil)
 
 // Cid represents a self-describing content addressed
 // identifier. It is formed by a Version, a Codec (which indicates
@@ -181,15 +226,6 @@ func Parse(v interface{}) (Cid, error) {
 	}
 }
 
-// MustParse calls Parse but will panic on error.
-func MustParse(v interface{}) Cid {
-	c, err := Parse(v)
-	if err != nil {
-		panic(err)
-	}
-	return c
-}
-
 // Decode parses a Cid-encoded string and returns a Cid object.
 // For CidV1, a Cid-encoded string is primarily a multibase string:
 //
@@ -378,13 +414,7 @@ func (c Cid) Hash() mh.Multihash {
 // Bytes returns the byte representation of a Cid.
 // The output of bytes can be parsed back into a Cid
 // with Cast().
-//
-// If c.Defined() == false, it return a nil slice and may not
-// be parsable with Cast().
 func (c Cid) Bytes() []byte {
-	if !c.Defined() {
-		return nil
-	}
 	return []byte(c.str)
 }
 
@@ -534,7 +564,7 @@ type Prefix struct {
 // and return a newly constructed Cid with the resulting multihash.
 func (p Prefix) Sum(data []byte) (Cid, error) {
 	length := p.MhLength
-	if p.MhType == mh.IDENTITY {
+	if p.MhType == mh.ID {
 		length = -1
 	}
 
@@ -543,8 +573,15 @@ func (p Prefix) Sum(data []byte) (Cid, error) {
 
 		return Undef, fmt.Errorf("invalid v0 prefix")
 	}
+	digest, err := mh.Digest(data, p.MhType, length)
+	if err != nil {
+		return Undef, err
+	}
+	return p.FromDigest(digest)
+}
 
-	hash, err := mh.Sum(data, p.MhType, length)
+func (p Prefix) FromDigest(digest []byte) (Cid, error) {
+	hash, err := mh.Encode(digest, p.MhType)
 	if err != nil {
 		return Undef, err
 	}
@@ -648,139 +685,3 @@ func CidFromBytes(data []byte) (int, Cid, error) {
 
 	return l, Cid{string(data[0:l])}, nil
 }
-
-func toBufByteReader(r io.Reader, dst []byte) *bufByteReader {
-	// If the reader already implements ByteReader, use it directly.
-	// Otherwise, use a fallback that does 1-byte Reads.
-	if br, ok := r.(io.ByteReader); ok {
-		return &bufByteReader{direct: br, dst: dst}
-	}
-	return &bufByteReader{fallback: r, dst: dst}
-}
-
-type bufByteReader struct {
-	direct   io.ByteReader
-	fallback io.Reader
-
-	dst []byte
-}
-
-func (r *bufByteReader) ReadByte() (byte, error) {
-	// The underlying reader has ReadByte; use it.
-	if br := r.direct; br != nil {
-		b, err := br.ReadByte()
-		if err != nil {
-			return 0, err
-		}
-		r.dst = append(r.dst, b)
-		return b, nil
-	}
-
-	// Fall back to a one-byte Read.
-	// TODO: consider reading straight into dst,
-	// once we have benchmarks and if they prove that to be faster.
-	var p [1]byte
-	if _, err := io.ReadFull(r.fallback, p[:]); err != nil {
-		return 0, err
-	}
-	r.dst = append(r.dst, p[0])
-	return p[0], nil
-}
-
-// CidFromReader reads a precise number of bytes for a CID from a given reader.
-// It returns the number of bytes read, the CID, and any error encountered.
-// The number of bytes read is accurate even if a non-nil error is returned.
-//
-// 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.
-func CidFromReader(r io.Reader) (int, Cid, error) {
-	// 64 bytes is enough for any CIDv0,
-	// and it's enough for most CIDv1s in practice.
-	// If the digest is too long, we'll allocate more.
-	br := toBufByteReader(r, make([]byte, 0, 64))
-
-	// We read the first varint, to tell if this is a CIDv0 or a CIDv1.
-	// The varint package wants a io.ByteReader, so we must wrap our io.Reader.
-	vers, err := varint.ReadUvarint(br)
-	if err != nil {
-		return len(br.dst), Undef, err
-	}
-
-	// If we have a CIDv0, read the rest of the bytes and cast the buffer.
-	if vers == mh.SHA2_256 {
-		if n, err := io.ReadFull(r, br.dst[1:34]); err != nil {
-			return len(br.dst) + n, Undef, err
-		}
-
-		br.dst = br.dst[:34]
-		h, err := mh.Cast(br.dst)
-		if err != nil {
-			return len(br.dst), Undef, err
-		}
-
-		return len(br.dst), Cid{string(h)}, nil
-	}
-
-	if vers != 1 {
-		return len(br.dst), Undef, fmt.Errorf("expected 1 as the cid version number, got: %d", vers)
-	}
-
-	// CID block encoding multicodec.
-	_, err = varint.ReadUvarint(br)
-	if err != nil {
-		return len(br.dst), Undef, err
-	}
-
-	// We could replace most of the code below with go-multihash's ReadMultihash.
-	// Note that it would save code, but prevent reusing buffers.
-	// Plus, we already have a ByteReader now.
-	mhStart := len(br.dst)
-
-	// Multihash hash function code.
-	_, err = varint.ReadUvarint(br)
-	if err != nil {
-		return len(br.dst), Undef, err
-	}
-
-	// Multihash digest length.
-	mhl, err := varint.ReadUvarint(br)
-	if err != nil {
-		return len(br.dst), Undef, err
-	}
-
-	// Refuse to make large allocations to prevent OOMs due to bugs.
-	const maxDigestAlloc = 32 << 20 // 32MiB
-	if mhl > maxDigestAlloc {
-		return len(br.dst), Undef, fmt.Errorf("refusing to allocate %d bytes for a digest", mhl)
-	}
-
-	// Fine to convert mhl to int, given maxDigestAlloc.
-	prefixLength := len(br.dst)
-	cidLength := prefixLength + int(mhl)
-	if cidLength > cap(br.dst) {
-		// If the multihash digest doesn't fit in our initial 64 bytes,
-		// efficiently extend the slice via append+make.
-		br.dst = append(br.dst, make([]byte, cidLength-len(br.dst))...)
-	} else {
-		// The multihash digest fits inside our buffer,
-		// so just extend its capacity.
-		br.dst = br.dst[:cidLength]
-	}
-
-	if n, err := io.ReadFull(r, br.dst[prefixLength:cidLength]); err != nil {
-		// We can't use len(br.dst) here,
-		// as we've only read n bytes past prefixLength.
-		return prefixLength + n, Undef, err
-	}
-
-	// This simply ensures the multihash is valid.
-	// TODO: consider removing this bit, as it's probably redundant;
-	// for now, it helps ensure consistency with CidFromBytes.
-	_, _, err = mh.MHFromBytes(br.dst[mhStart:])
-	if err != nil {
-		return len(br.dst), Undef, err
-	}
-
-	return len(br.dst), Cid{string(br.dst)}, nil
-}

cid_fuzz.go

@@ -1,10 +1,10 @@
-//go:build gofuzz
 // +build gofuzz
 
 package cid
 
 func Fuzz(data []byte) int {
 	cid, err := Cast(data)
+
 	if err != nil {
 		return 0
 	}

cid_test.go

@@ -4,17 +4,46 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
 	"math/rand"
 	"reflect"
 	"strings"
 	"testing"
-	"testing/iotest"
 
 	mbase "github.com/multiformats/go-multibase"
 	mh "github.com/multiformats/go-multihash"
 )
 
+// Copying the "silly test" idea from
+// https://github.com/multiformats/go-multihash/blob/7aa9f26a231c6f34f4e9fad52bf580fd36627285/multihash_test.go#L13
+// Makes it so changing the table accidentally has to happen twice.
+var tCodecs = map[uint64]string{
+	Raw:                   "raw",
+	DagProtobuf:           "protobuf",
+	DagCBOR:               "cbor",
+	Libp2pKey:             "libp2p-key",
+	GitRaw:                "git-raw",
+	EthBlock:              "eth-block",
+	EthBlockList:          "eth-block-list",
+	EthTxTrie:             "eth-tx-trie",
+	EthTx:                 "eth-tx",
+	EthTxReceiptTrie:      "eth-tx-receipt-trie",
+	EthTxReceipt:          "eth-tx-receipt",
+	EthStateTrie:          "eth-state-trie",
+	EthAccountSnapshot:    "eth-account-snapshot",
+	EthStorageTrie:        "eth-storage-trie",
+	BitcoinBlock:          "bitcoin-block",
+	BitcoinTx:             "bitcoin-tx",
+	ZcashBlock:            "zcash-block",
+	ZcashTx:               "zcash-tx",
+	DecredBlock:           "decred-block",
+	DecredTx:              "decred-tx",
+	DashBlock:             "dash-block",
+	DashTx:                "dash-tx",
+	FilCommitmentUnsealed: "fil-commitment-unsealed",
+	FilCommitmentSealed:   "fil-commitment-sealed",
+	DagJOSE:               "dag-jose",
+}
+
 func assertEqual(t *testing.T, a, b Cid) {
 	if a.Type() != b.Type() {
 		t.Fatal("mismatch on type")
@@ -29,11 +58,31 @@ func assertEqual(t *testing.T, a, b Cid) {
 	}
 }
 
+func TestTable(t *testing.T) {
+	if len(tCodecs) != len(Codecs)-1 {
+		t.Errorf("Item count mismatch in the Table of Codec. Should be %d, got %d", len(tCodecs)+1, len(Codecs))
+	}
+
+	for k, v := range tCodecs {
+		if Codecs[v] != k {
+			t.Errorf("Table mismatch: 0x%x %s", k, v)
+		}
+	}
+}
+
+// The table returns cid.DagProtobuf for "v0"
+// so we test it apart
+func TestTableForV0(t *testing.T) {
+	if Codecs["v0"] != DagProtobuf {
+		t.Error("Table mismatch: Codecs[\"v0\"] should resolve to DagProtobuf (0x70)")
+	}
+}
+
 func TestPrefixSum(t *testing.T) {
 	// Test creating CIDs both manually and with Prefix.
 	// Tests: https://github.com/ipfs/go-cid/issues/83
 	for _, hashfun := range []uint64{
-		mh.IDENTITY, mh.SHA3, mh.SHA2_256,
+		mh.ID, mh.SHA3, mh.SHA2_256,
 	} {
 		h1, err := mh.Sum([]byte("TEST"), hashfun, -1)
 		if err != nil {
@@ -56,7 +105,37 @@ func TestPrefixSum(t *testing.T) {
 		}
 	}
 }
+func TestPrefixDigest(t *testing.T) {
+	// Test creating CIDs both manually and with Prefix.
+	// Tests: https://github.com/ipfs/go-cid/issues/83
+	for _, hashfun := range []uint64{
+		mh.ID, mh.SHA3, mh.SHA2_256,
+	} {
+		h1, err := mh.Sum([]byte("TEST"), hashfun, -1)
+		if err != nil {
+			t.Fatal(err)
+		}
+		c1 := NewCidV1(Raw, h1)
 
+		h2, err := mh.Sum([]byte("foobar"), hashfun, -1)
+		if err != nil {
+			t.Fatal(err)
+		}
+		c2 := NewCidV1(Raw, h2)
+
+		digest, err := mh.Digest([]byte("foobar"), hashfun, -1)
+		if err != nil {
+			t.Fatal(err)
+		}
+		c3, err := c1.Prefix().FromDigest(digest)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !c2.Equals(c3) {
+			t.Fatal("expected CIDs to be equal")
+		}
+	}
+}
 func TestBasicMarshaling(t *testing.T) {
 	h, err := mh.Sum([]byte("TEST"), mh.SHA3, 4)
 	if err != nil {
@@ -339,6 +418,7 @@ func TestNewPrefixV0(t *testing.T) {
 	if c1.Prefix() != c2.Prefix() {
 		t.Fatal("prefixes mismatch")
 	}
+
 }
 
 func TestInvalidV0Prefix(t *testing.T) {
@@ -462,13 +542,13 @@ func TestParse(t *testing.T) {
 	}
 
 	assertions := [][]interface{}{
-		{NewCidV0(h), theHash},
-		{NewCidV0(h).Bytes(), theHash},
-		{h, theHash},
-		{theHash, theHash},
-		{"/ipfs/" + theHash, theHash},
-		{"https://ipfs.io/ipfs/" + theHash, theHash},
-		{"http://localhost:8080/ipfs/" + theHash, theHash},
+		[]interface{}{NewCidV0(h), theHash},
+		[]interface{}{NewCidV0(h).Bytes(), theHash},
+		[]interface{}{h, theHash},
+		[]interface{}{theHash, theHash},
+		[]interface{}{"/ipfs/" + theHash, theHash},
+		[]interface{}{"https://ipfs.io/ipfs/" + theHash, theHash},
+		[]interface{}{"http://localhost:8080/ipfs/" + theHash, theHash},
 	}
 
 	assert := func(arg interface{}, expected string) error {
@@ -616,7 +696,6 @@ func TestReadCidsFromBuffer(t *testing.T) {
 		"k2cwueckqkibutvhkr4p2ln2pjcaxaakpd9db0e7j7ax1lxhhxy3ekpv",
 		"Qmf5Qzp6nGBku7CEn2UQx4mgN8TW69YUok36DrGa6NN893",
 		"zb2rhZi1JR4eNc2jBGaRYJKYM8JEB4ovenym8L1CmFsRAytkz",
-		"bafkqarjpmzuwyzltorxxezjpkvcfgqkfjfbfcvslivje2vchkzdu6rckjjcfgtkolaze6mssjqzeyn2ekrcfatkjku2vowseky3fswkfkm2deqkrju3e2",
 	}
 
 	var cids []Cid
@@ -644,98 +723,51 @@ func TestReadCidsFromBuffer(t *testing.T) {
 	if cur != len(buf) {
 		t.Fatal("had trailing bytes")
 	}
-
-	// The same, but now with CidFromReader.
-	// In multiple forms, to catch more io interface bugs.
-	for _, r := range []io.Reader{
-		// implements io.ByteReader
-		bytes.NewReader(buf),
-
-		// tiny reads, no io.ByteReader
-		iotest.OneByteReader(bytes.NewReader(buf)),
-	} {
-		cur = 0
-		for _, expc := range cids {
-			n, c, err := CidFromReader(r)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if c != expc {
-				t.Fatal("cids mismatched")
-			}
-			cur += n
-		}
-		if cur != len(buf) {
-			t.Fatal("had trailing bytes")
-		}
-	}
 }
 
-func TestBadCidInput(t *testing.T) {
-	for _, name := range []string{
-		"FromBytes",
-		"FromReader",
-	} {
-		t.Run(name, func(t *testing.T) {
-			usingReader := name == "FromReader"
+func TestBadCidFromBytes(t *testing.T) {
+	l, c, err := CidFromBytes([]byte{mh.SHA2_256, 32, 0x00})
+	if err == nil {
+		t.Fatal("expected not-enough-bytes for V0 CidFromBytes")
+	}
+	if l != 0 {
+		t.Fatal("expected length=0 from bad CidFromBytes")
+	}
+	if c != Undef {
+		t.Fatal("expected Undef CID from bad CidFromBytes")
+	}
 
-			fromBytes := CidFromBytes
-			if usingReader {
-				fromBytes = func(data []byte) (int, Cid, error) {
-					return CidFromReader(bytes.NewReader(data))
-				}
-			}
+	c, err = Decode("bafkreie5qrjvaw64n4tjm6hbnm7fnqvcssfed4whsjqxzslbd3jwhsk3mm")
+	if err != nil {
+		t.Fatal(err)
+	}
+	byts := make([]byte, c.ByteLen())
+	copy(byts, c.Bytes())
+	byts[1] = 0x80 // bad codec varint
+	byts[2] = 0x00
+	l, c, err = CidFromBytes(byts)
+	if err == nil {
+		t.Fatal("expected not-enough-bytes for V1 CidFromBytes")
+	}
+	if l != 0 {
+		t.Fatal("expected length=0 from bad CidFromBytes")
+	}
+	if c != Undef {
+		t.Fatal("expected Undef CID from bad CidFromBytes")
+	}
 
-			l, c, err := fromBytes([]byte{mh.SHA2_256, 32, 0x00})
-			if err == nil {
-				t.Fatal("expected not-enough-bytes for V0 CID")
-			}
-			if !usingReader && l != 0 {
-				t.Fatal("expected length==0 from bad CID")
-			} else if usingReader && l == 0 {
-				t.Fatal("expected length!=0 from bad CID")
-			}
-			if c != Undef {
-				t.Fatal("expected Undef CID from bad CID")
-			}
-
-			c, err = Decode("bafkreie5qrjvaw64n4tjm6hbnm7fnqvcssfed4whsjqxzslbd3jwhsk3mm")
-			if err != nil {
-				t.Fatal(err)
-			}
-			byts := make([]byte, c.ByteLen())
-			copy(byts, c.Bytes())
-			byts[1] = 0x80 // bad codec varint
-			byts[2] = 0x00
-			l, c, err = fromBytes(byts)
-			if err == nil {
-				t.Fatal("expected not-enough-bytes for V1 CID")
-			}
-			if !usingReader && l != 0 {
-				t.Fatal("expected length==0 from bad CID")
-			} else if usingReader && l == 0 {
-				t.Fatal("expected length!=0 from bad CID")
-			}
-			if c != Undef {
-				t.Fatal("expected Undef CID from bad CID")
-			}
-
-			copy(byts, c.Bytes())
-			byts[2] = 0x80 // bad multihash varint
-			byts[3] = 0x00
-			l, c, err = fromBytes(byts)
-			if err == nil {
-				t.Fatal("expected not-enough-bytes for V1 CID")
-			}
-			if !usingReader && l != 0 {
-				t.Fatal("expected length==0 from bad CID")
-			} else if usingReader && l == 0 {
-				t.Fatal("expected length!=0 from bad CID")
-			}
-			if c != Undef {
-				t.Fatal("expected Undef CID from bad CidFromBytes")
-			}
-		})
+	copy(byts, c.Bytes())
+	byts[2] = 0x80 // bad multihash varint
+	byts[3] = 0x00
+	l, c, err = CidFromBytes(byts)
+	if err == nil {
+		t.Fatal("expected not-enough-bytes for V1 CidFromBytes")
+	}
+	if l != 0 {
+		t.Fatal("expected length=0 from bad CidFromBytes")
+	}
+	if c != Undef {
+		t.Fatal("expected Undef CID from bad CidFromBytes")
 	}
 }
 

go.mod

@@ -2,19 +2,8 @@ module github.com/ipfs/go-cid
 
 require (
 	github.com/multiformats/go-multibase v0.0.3
-	github.com/multiformats/go-multihash v0.0.15
+	github.com/multiformats/go-multihash v0.0.15-0.20210226003459-69a4fed1d6f2
 	github.com/multiformats/go-varint v0.0.6
 )
 
-require (
-	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
-	golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf // indirect
-	golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 // indirect
-)
-
-go 1.17
+go 1.13

go.sum

@@ -1,35 +1,33 @@
-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/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/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771 h1:MHkK1uRtFbVqvAgvWxafZe54+5uBxLluGylDiKgdhwo=
+github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
+github.com/mr-tron/base58 v1.1.0 h1:Y51FGVJ91WBqCEabAi5OPUz38eAx8DakuAm5svLcsfQ=
 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/mr-tron/base58 v1.1.3 h1:v+sk57XuaCKGXpWtVBX8YJzO7hMGx4Aajh4TQbdEFdc=
+github.com/mr-tron/base58 v1.1.3/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.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-multihash v0.0.13 h1:06x+mk/zj1FoMsgNejLpy6QTvJqlSt/BhLEy87zidlc=
+github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
+github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
+github.com/multiformats/go-multihash v0.0.15-0.20210226003459-69a4fed1d6f2 h1:0DZ3ybel2YfQ4L9GrglYgfXxdXVT8CVkJt//crxSQDM=
+github.com/multiformats/go-multihash v0.0.15-0.20210226003459-69a4fed1d6f2/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
+github.com/multiformats/go-varint v0.0.5 h1:XVZwSo04Cs3j/jS0uAEPpT3JY6DzMcVLLoWOSnCxOjg=
+github.com/multiformats/go-varint v0.0.5/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 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=
+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.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.0.0-20210506145944-38f3c27a63bf h1:B2n+Zi5QeYRDAEodEu72OS36gmTWjgpXr2+cWcBW90o=
-golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 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-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210309074719-68d13333faf2 h1:46ULzRKLh1CwgRq2dC5SlBzEqqNCi8rreOZnNrbqcIY=
-golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

version.json

@@ -1,3 +0,0 @@
-{
-  "version": "v0.3.0"
-}