refactor(cborutil): extract cborutil library

Use extracted cborutil library

chain/actors/actor_storagemarket.go

@@ -16,7 +16,7 @@ import (
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/actors/aerrors"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 	"github.com/filecoin-project/lotus/lib/sectorbuilder"
 )
 

chain/blocksync/blocksync.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/filecoin-project/lotus/chain/store"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 
 	"github.com/ipfs/go-cid"
 	cbor "github.com/ipfs/go-ipld-cbor"

chain/blocksync/blocksync_client.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/filecoin-project/lotus/chain/store"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	"github.com/filecoin-project/lotus/peermgr"
 )

chain/deals/client.go

@@ -19,7 +19,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/store"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/chain/wallet"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 	"github.com/filecoin-project/lotus/lib/statestore"
 	"github.com/filecoin-project/lotus/node/impl/full"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"

chain/deals/client_states.go

@@ -11,7 +11,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/stmgr"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 )
 
 type clientHandlerFunc func(ctx context.Context, deal ClientDeal) (func(*ClientDeal), error)

chain/deals/client_utils.go

@@ -13,7 +13,7 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/datatransfer"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 	"github.com/filecoin-project/lotus/lib/padreader"
 	"github.com/filecoin-project/lotus/lib/sectorbuilder"
 	"github.com/filecoin-project/lotus/lib/statestore"

chain/deals/provider.go

@@ -17,7 +17,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/filecoin-project/lotus/datatransfer"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 	"github.com/filecoin-project/lotus/lib/statestore"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 	"github.com/filecoin-project/lotus/storage"

chain/deals/provider_asks.go

@@ -8,7 +8,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/chain/stmgr"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 	datastore "github.com/ipfs/go-datastore"
 	inet "github.com/libp2p/go-libp2p-core/network"
 	"golang.org/x/xerrors"

chain/deals/provider_utils.go

@@ -13,7 +13,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 	"github.com/filecoin-project/lotus/lib/statestore"
 
 	"github.com/ipfs/go-cid"

chain/deals/request_validation_test.go

@@ -18,7 +18,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/deals"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 	"github.com/filecoin-project/lotus/lib/statestore"
 )
 

chain/deals/types.go

@@ -8,7 +8,7 @@ import (
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/chain/actors"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 	"github.com/ipfs/go-cid"
 )
 

chain/types/voucher.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"encoding/base64"
 
+	cborrpc "github.com/filecoin-project/go-cbor-util"
 	"github.com/filecoin-project/go-address"
-	cborrpc "github.com/filecoin-project/lotus/lib/cborutil"
 	cbor "github.com/ipfs/go-ipld-cbor"
 )
 

cmd/lotus-storage-miner/init.go

@@ -28,7 +28,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 	lcli "github.com/filecoin-project/lotus/cli"
 	"github.com/filecoin-project/lotus/genesis"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 	"github.com/filecoin-project/lotus/lib/sectorbuilder"
 	"github.com/filecoin-project/lotus/miner"
 	"github.com/filecoin-project/lotus/node/modules"

go.mod

@@ -14,6 +14,7 @@ require (
 	github.com/filecoin-project/filecoin-ffi v0.0.0-20191213130254-f261762ff8ed
 	github.com/filecoin-project/go-address v0.0.0-20191219011437-af739c490b4f
 	github.com/filecoin-project/go-amt-ipld v0.0.0-20191205011053-79efc22d6cdc
+	github.com/filecoin-project/go-cbor-util v0.0.0-20191219014500-08c40a1e63a2
 	github.com/filecoin-project/go-crypto v0.0.0-20191218222705-effae4ea9f03
 	github.com/filecoin-project/go-paramfetch v0.0.0-20200102181131-b20d579f2878
 	github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1

go.sum

@@ -89,6 +89,8 @@ github.com/filecoin-project/go-paramfetch v0.0.0-20200102181131-b20d579f2878 h1:
 github.com/filecoin-project/go-paramfetch v0.0.0-20200102181131-b20d579f2878/go.mod h1:40kI2Gv16mwcRsHptI3OAV4nlOEU7wVDc4RgMylNFjU=
 github.com/filecoin-project/go-crypto v0.0.0-20191218222705-effae4ea9f03 h1:2pMXdBnCiXjfCYx/hLqFxccPoqsSveQFxVLvNxy9bus=
 github.com/filecoin-project/go-crypto v0.0.0-20191218222705-effae4ea9f03/go.mod h1:+viYnvGtUTgJRdy6oaeF4MTFKAfatX071MPDPBL11EQ=
+github.com/filecoin-project/go-cbor-util v0.0.0-20191219014500-08c40a1e63a2 h1:av5fw6wmm58FYMgJeoB/lK9XXrgdugYiTqkdxjTy9k8=
+github.com/filecoin-project/go-cbor-util v0.0.0-20191219014500-08c40a1e63a2/go.mod h1:pqTiPHobNkOVM5thSRsHYjyQfq7O5QSCMhvuu9JoDlg=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/gbrlsnchs/jwt/v3 v3.0.0-beta.1 h1:EzDjxMg43q1tA2c0MV3tNbaontnHLplHyFF6M5KiVP0=

lib/cborutil/rpc.go

@@ -1,80 +0,0 @@
-package cborutil
-
-import (
-	"bytes"
-	"encoding/hex"
-	"io"
-	"math"
-
-	cbor "github.com/ipfs/go-ipld-cbor"
-	ipld "github.com/ipfs/go-ipld-format"
-	logging "github.com/ipfs/go-log"
-	cbg "github.com/whyrusleeping/cbor-gen"
-)
-
-var log = logging.Logger("cborrrpc")
-
-const Debug = false
-
-func init() {
-	if Debug {
-		log.Warn("CBOR-RPC Debugging enabled")
-	}
-}
-
-func WriteCborRPC(w io.Writer, obj interface{}) error {
-	if m, ok := obj.(cbg.CBORMarshaler); ok {
-		// TODO: impl debug
-		return m.MarshalCBOR(w)
-	}
-	data, err := cbor.DumpObject(obj)
-	if err != nil {
-		return err
-	}
-
-	if Debug {
-		log.Infof("> %s", hex.EncodeToString(data))
-	}
-
-	_, err = w.Write(data)
-	return err
-}
-
-func ReadCborRPC(r io.Reader, out interface{}) error {
-	if um, ok := out.(cbg.CBORUnmarshaler); ok {
-		return um.UnmarshalCBOR(r)
-	}
-	return cbor.DecodeReader(r, out)
-}
-
-func Dump(obj interface{}) ([]byte, error) {
-	var out bytes.Buffer
-	if err := WriteCborRPC(&out, obj); err != nil {
-		return nil, err
-	}
-	return out.Bytes(), nil
-}
-
-// TODO: this is a bit ugly, and this package is not exactly the best place
-func AsIpld(obj interface{}) (ipld.Node, error) {
-	if m, ok := obj.(cbg.CBORMarshaler); ok {
-		b, err := Dump(m)
-		if err != nil {
-			return nil, err
-		}
-		return cbor.Decode(b, math.MaxUint64, -1)
-	}
-	return cbor.WrapObject(obj, math.MaxUint64, -1)
-}
-
-func Equals(a cbg.CBORMarshaler, b cbg.CBORMarshaler) (bool, error) {
-	ab, err := Dump(a)
-	if err != nil {
-		return false, err
-	}
-	bb, err := Dump(b)
-	if err != nil {
-		return false, err
-	}
-	return bytes.Equal(ab, bb), nil
-}

lib/statestore/store.go

@@ -11,7 +11,7 @@ import (
 	"go.uber.org/multierr"
 	"golang.org/x/xerrors"
 
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 )
 
 type StateStore struct {

lib/statestore/store_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/ipfs/go-datastore"
 
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 )
 
 func TestList(t *testing.T) {

node/hello/hello.go

@@ -15,7 +15,7 @@ import (
 	"github.com/filecoin-project/lotus/chain"
 	"github.com/filecoin-project/lotus/chain/store"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 	"github.com/filecoin-project/lotus/peermgr"
 )
 

paych/store.go

@@ -14,7 +14,7 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/chain/types"
-	cborrpc "github.com/filecoin-project/lotus/lib/cborutil"
+	cborrpc "github.com/filecoin-project/go-cbor-util"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"
 )
 

retrieval/client.go

@@ -17,7 +17,7 @@ import (
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 	payapi "github.com/filecoin-project/lotus/node/impl/paych"
 	"github.com/filecoin-project/lotus/paych"
 	"github.com/filecoin-project/lotus/retrieval/discovery"

retrieval/miner.go

@@ -15,7 +15,7 @@ import (
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/build"
 	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 	"github.com/filecoin-project/lotus/storage/sectorblocks"
 )
 

storage/sectorblocks/blocks.go

@@ -19,7 +19,7 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/lotus/api"
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 	"github.com/filecoin-project/lotus/lib/padreader"
 	"github.com/filecoin-project/lotus/lib/sectorbuilder"
 	"github.com/filecoin-project/lotus/node/modules/dtypes"

storage/sectors_test.go

@@ -6,7 +6,7 @@ import (
 
 	"gotest.tools/assert"
 
-	"github.com/filecoin-project/lotus/lib/cborutil"
+	"github.com/filecoin-project/go-cbor-util"
 )
 
 func TestSectorInfoSelialization(t *testing.T) {