remove sharness

core/commands/object/object.go

@@ -1,14 +1,9 @@
 package objectcmd
 
 import (
-	"encoding/base64"
 	"errors"
 
 	cmds "github.com/ipfs/go-ipfs-cmds"
-
-	dag "github.com/ipfs/boxo/ipld/merkledag"
-	"github.com/ipfs/go-cid"
-	ipld "github.com/ipfs/go-ipld-format"
 )
 
 type Node struct {
@@ -28,16 +23,6 @@ type Object struct {
 
 var ErrDataEncoding = errors.New("unknown data field encoding")
 
-const (
-	headersOptionName      = "headers"
-	encodingOptionName     = "data-encoding"
-	inputencOptionName     = "inputenc"
-	datafieldencOptionName = "datafieldenc"
-	pinOptionName          = "pin"
-	quietOptionName        = "quiet"
-	humanOptionName        = "human"
-)
-
 var ObjectCmd = &cmds.Command{
 	Status: cmds.Deprecated, // https://github.com/ipfs/kubo/issues/7936
 	Helptext: cmds.HelpText{
@@ -51,49 +36,3 @@ directly. Deprecated, use more modern 'ipfs dag' and 'ipfs files' instead.`,
 		"diff": ObjectDiffCmd,
 	},
 }
-
-// converts the Node object into a real dag.ProtoNode
-func deserializeNode(nd *Node, dataFieldEncoding string) (*dag.ProtoNode, error) {
-	dagnode := new(dag.ProtoNode)
-	switch dataFieldEncoding {
-	case "text":
-		dagnode.SetData([]byte(nd.Data))
-	case "base64":
-		data, err := base64.StdEncoding.DecodeString(nd.Data)
-		if err != nil {
-			return nil, err
-		}
-		dagnode.SetData(data)
-	default:
-		return nil, ErrDataEncoding
-	}
-
-	links := make([]*ipld.Link, len(nd.Links))
-	for i, link := range nd.Links {
-		c, err := cid.Decode(link.Hash)
-		if err != nil {
-			return nil, err
-		}
-		links[i] = &ipld.Link{
-			Name: link.Name,
-			Size: link.Size,
-			Cid:  c,
-		}
-	}
-	if err := dagnode.SetLinks(links); err != nil {
-		return nil, err
-	}
-
-	return dagnode, nil
-}
-
-func encodeData(data []byte, encoding string) (string, error) {
-	switch encoding {
-	case "text":
-		return string(data), nil
-	case "base64":
-		return base64.StdEncoding.EncodeToString(data), nil
-	}
-
-	return "", ErrDataEncoding
-}

test/sharness/t0050-block.sh

@@ -42,12 +42,12 @@ test_expect_success "'ipfs block put' output looks good" '
 '
 
 test_expect_success "can set cid codec on block put" '
-  CODEC_HASH=$(ipfs block put --cid-codec=dag-pb ../t0051-object-data/testPut.pb)
+  CODEC_HASH=$(ipfs block put --cid-codec=dag-pb ../t0050-block/testPut.pb)
 '
 
 test_expect_success "block get output looks right" '
   ipfs block get $CODEC_HASH > pb_block_out &&
-  test_cmp pb_block_out ../t0051-object-data/testPut.pb
+  test_cmp pb_block_out ../t0050-block/testPut.pb
 '
 
 #
@@ -210,7 +210,7 @@ test_expect_success "multi-block 'ipfs block rm -q' produces no output" '
 # --format used 'protobuf' for 'dag-pb' which was invalid, but we keep
 # for backward-compatibility
 test_expect_success "can set deprecated --format=protobuf on block put" '
-  HASH=$(ipfs block put --format=protobuf ../t0051-object-data/testPut.pb)
+  HASH=$(ipfs block put --format=protobuf ../t0050-block/testPut.pb)
 '
 
 test_expect_success "created an object correctly!" '
@@ -221,11 +221,11 @@ test_expect_success "created an object correctly!" '
 
 test_expect_success "block get output looks right" '
   ipfs block get $HASH > pb_block_out &&
-  test_cmp pb_block_out ../t0051-object-data/testPut.pb
+  test_cmp pb_block_out ../t0050-block/testPut.pb
 '
 
 test_expect_success "can set --cid-codec=dag-pb on block put" '
-  HASH=$(ipfs block put --cid-codec=dag-pb ../t0051-object-data/testPut.pb)
+  HASH=$(ipfs block put --cid-codec=dag-pb ../t0050-block/testPut.pb)
 '
 
 test_expect_success "created an object correctly!" '
@@ -236,7 +236,7 @@ test_expect_success "created an object correctly!" '
 
 test_expect_success "block get output looks right" '
   ipfs block get $HASH > pb_block_out &&
-  test_cmp pb_block_out ../t0051-object-data/testPut.pb
+  test_cmp pb_block_out ../t0050-block/testPut.pb
 '
 
 test_expect_success "can set multihash type and length on block put with --format=raw (deprecated)" '
@@ -248,7 +248,7 @@ test_expect_success "output looks good" '
 '
 
 test_expect_success "can't use both legacy format and custom cid-codec at the same time" '
-  test_expect_code 1 ipfs block put --format=dag-cbor --cid-codec=dag-json < ../t0051-object-data/testPut.pb 2> output &&
+  test_expect_code 1 ipfs block put --format=dag-cbor --cid-codec=dag-json < ../t0050-block/testPut.pb 2> output &&
   test_should_contain "unable to use \"format\" (deprecated) and a custom \"cid-codec\" at the same time" output
 '