Skip to content

GitLab

Commit 105ef005 authored by tavit ohanian's avatar tavit ohanian
Browse files
Options

Merge branch 'port-2021-04-18'

parents a3c79db2 ca581011
Pipeline #851 passed with stages
      in 18 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 6 additions and 8 deletions
      _rsrch/cidiface/enums.go
      View file @ 105ef005
      ...@@ -8,7 +8,7 @@ const ( ...@@ -8,7 +8,7 @@ const (
      DagProtobuf = 0x70 DagProtobuf = 0x70
      DagCBOR = 0x71 DagCBOR = 0x71
      Libp2pKey = 0x72 P2pKey = 0x72
      GitRaw = 0x78 GitRaw = 0x78
      ...@@ -35,7 +35,7 @@ var Codecs = map[string]uint64{ ...@@ -35,7 +35,7 @@ var Codecs = map[string]uint64{
      "raw": Raw, "raw": Raw,
      "protobuf": DagProtobuf, "protobuf": DagProtobuf,
      "cbor": DagCBOR, "cbor": DagCBOR,
      "libp2p-key": Libp2pKey, "p2p-key": P2pKey,
      "git-raw": GitRaw, "git-raw": GitRaw,
      "eth-block": EthBlock, "eth-block": EthBlock,
      "eth-block-list": EthBlockList, "eth-block-list": EthBlockList,
      ...@@ -59,7 +59,7 @@ var CodecToStr = map[uint64]string{ ...@@ -59,7 +59,7 @@ var CodecToStr = map[uint64]string{
      Raw: "raw", Raw: "raw",
      DagProtobuf: "protobuf", DagProtobuf: "protobuf",
      DagCBOR: "cbor", DagCBOR: "cbor",
      Libp2pKey: "libp2p-key", P2pKey: "p2p-key",
      GitRaw: "git-raw", GitRaw: "git-raw",
      EthBlock: "eth-block", EthBlock: "eth-block",
      EthBlockList: "eth-block-list", EthBlockList: "eth-block-list",
      ......
      cid.go
      View file @ 105ef005
      ...@@ -54,7 +54,7 @@ const ( ...@@ -54,7 +54,7 @@ const (
      DagProtobuf = 0x70 DagProtobuf = 0x70
      DagCBOR = 0x71 DagCBOR = 0x71
      Libp2pKey = 0x72 P2pKey = 0x72
      GitRaw = 0x78 GitRaw = 0x78
      ...@@ -86,7 +86,7 @@ var Codecs = map[string]uint64{ ...@@ -86,7 +86,7 @@ var Codecs = map[string]uint64{
      "raw": Raw, "raw": Raw,
      "protobuf": DagProtobuf, "protobuf": DagProtobuf,
      "cbor": DagCBOR, "cbor": DagCBOR,
      "libp2p-key": Libp2pKey, "p2p-key": P2pKey,
      "git-raw": GitRaw, "git-raw": GitRaw,
      "eth-block": EthBlock, "eth-block": EthBlock,
      "eth-block-list": EthBlockList, "eth-block-list": EthBlockList,
      ......
      cid_test.go
      View file @ 105ef005
      ...@@ -20,7 +20,7 @@ var tCodecs = map[uint64]string{ ...@@ -20,7 +20,7 @@ var tCodecs = map[uint64]string{
      Raw: "raw", Raw: "raw",
      DagProtobuf: "protobuf", DagProtobuf: "protobuf",
      DagCBOR: "cbor", DagCBOR: "cbor",
      Libp2pKey: "libp2p-key", P2pKey: "p2p-key",
      GitRaw: "git-raw", GitRaw: "git-raw",
      EthBlock: "eth-block", EthBlock: "eth-block",
      EthBlockList: "eth-block-list", EthBlockList: "eth-block-list",
      ......
      go.sum
      View file @ 105ef005
      ...@@ -12,8 +12,6 @@ github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ8 ...@@ -12,8 +12,6 @@ github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ8
      github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM= 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 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk=
      github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc= github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc=
      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 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I= github.com/multiformats/go-multihash v0.0.14 h1:QoBceQYQQtNUuf6s7wHxnE2c8bhbMqhfGzNI032se/I=
      github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc= github.com/multiformats/go-multihash v0.0.14/go.mod h1:VdAWLKTwram9oKAatUcLxBNUjdtcVwxObEQBtRfuyjc=
      github.com/multiformats/go-varint v0.0.5 h1:XVZwSo04Cs3j/jS0uAEPpT3JY6DzMcVLLoWOSnCxOjg= github.com/multiformats/go-varint v0.0.5 h1:XVZwSo04Cs3j/jS0uAEPpT3JY6DzMcVLLoWOSnCxOjg=
      ......
      Markdown is supported
      0% or .
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment