Merge branch 'release_2.3.3_base_t' into release_2.3.3

blocks/blockstoreutil/remove.go

@@ -71,8 +71,8 @@ func RmBlocks(ctx context.Context, blocks bs.GCBlockstore, pins pin.Pinner, cids
 }
 
 // FilterPinned takes a slice of Cids and returns it with the pinned Cids
-// removed. If a Cid is pinned, it will place RemovedBlock objects in the given
-// out channel, with an error which indicates that the Cid is pinned.
+// removed. If a CID is pinned, it will place RemovedBlock objects in the given
+// out channel, with an error which indicates that the CID is pinned.
 // This function is used in RmBlocks to filter out any blocks which are not
 // to be removed (because they are pinned).
 func FilterPinned(ctx context.Context, pins pin.Pinner, out chan<- interface{}, cids []cid.Cid) []cid.Cid {

core/commands/cid.go

@@ -117,7 +117,7 @@ The optional format string is a printf style format string:
 }
 
 type CidFormatRes struct {
-	CidStr    string // Original Cid String passed in
+	CidStr    string // Original CID String passed in
 	Formatted string // Formatted Result
 	ErrorMsg  string // Error
 }

core/commands/cmdenv/cidbase.go

@@ -58,7 +58,7 @@ func CidBaseDefined(req *cmds.Request) bool {
 }
 
 // CidEncoderFromPath creates a new encoder that is influenced from
-// the encoded Cid in a Path.  For CidV0 the multibase from the base
+// the encoded CID in a Path.  For CidV0 the multibase from the base
 // encoder is used and automatic upgrades are disabled.  For CidV1 the
 // multibase from the CID is used and upgrades are enabled.
 //

core/commands/files.go

@@ -87,8 +87,8 @@ const (
 	filesHashOptionName       = "hash"
 )
 
-var cidVersionOption = cmds.IntOption(filesCidVersionOptionName, "cid-ver", "Cid version to use. (experimental)")
-var hashOption = cmds.StringOption(filesHashOptionName, "Hash function to use. Will set Cid version to 1 if used. (experimental)")
+var cidVersionOption = cmds.IntOption(filesCidVersionOptionName, "cid-ver", "CID version to use. (experimental)")
+var hashOption = cmds.StringOption(filesHashOptionName, "Hash function to use. Will set CID version to 1 if used. (experimental)")
 
 var errFormat = errors.New("format was set by multiple options. Only one format option is allowed")
 
@@ -735,7 +735,7 @@ stat' on the file or any of its ancestors.
 	},
 	Arguments: []cmds.Argument{
 		cmds.StringArg("path", true, false, "Path to write to."),
-		cmds.FileArg("data", true, false, "Data to write.").EnableStdin(),
+		cmds.FileArg("data", true, false, "data to write.").EnableStdin(),
 	},
 	Options: []cmds.Option{
 		cmds.Int64Option(filesOffsetOptionName, "o", "Byte offset to begin writing at."),

core/commands/filestore.go

@@ -45,7 +45,7 @@ The output is:
 `,
 	},
 	Arguments: []cmds.Argument{
-		cmds.StringArg("obj", false, true, "Cid of objects to list."),
+		cmds.StringArg("obj", false, true, "CID of objects to list."),
 	},
 	Options: []cmds.Option{
 		cmds.BoolOption(fileOrderOptionName, "sort the results based on the path of the backing file"),
@@ -122,7 +122,7 @@ For ERROR entries the error will also be printed to stderr.
 `,
 	},
 	Arguments: []cmds.Argument{
-		cmds.StringArg("obj", false, true, "Cid of objects to verify."),
+		cmds.StringArg("obj", false, true, "CID of objects to verify."),
 	},
 	Options: []cmds.Option{
 		cmds.BoolOption(fileOrderOptionName, "verify the objects based on the order of the backing file"),

core/commands/object/object.go

@@ -270,7 +270,7 @@ Supported values are:
 	Type: Node{},
 	Encoders: cmds.EncoderMap{
 		cmds.Protobuf: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *Node) error {
-			// deserialize the Data field as text as this was the standard behaviour
+			// deserialize the data field as text as this was the standard behaviour
 			object, err := deserializeNode(out, "text")
 			if err != nil {
 				return nil
@@ -371,20 +371,20 @@ It reads from stdin, and the output is a base58 encoded multihash.
 'btfs object put' is a plumbing command for storing DAG nodes.
 It reads from stdin, and the output is a base58 encoded multihash.
 
-Data should be in the format specified by the --inputenc flag.
+data should be in the format specified by the --inputenc flag.
 --inputenc may be one of the following:
 	* "protobuf"
 	* "json" (default)
 
 Examples:
 
-	$ echo '{ "Data": "abc" }' | btfs object put
+	$ echo '{ "data": "abc" }' | btfs object put
 
 This creates a node with the data 'abc' and no links. For an object with
 links, create a file named 'node.json' with the contents:
 
     {
-        "Data": "another",
+        "data": "another",
         "Links": [ {
             "Name": "some link",
             "Hash": "QmXg9Pp2ytZ14xgmQjYEiHjVjMFXzCVVEcRTWJBmLgR39V",
@@ -399,7 +399,7 @@ And then run:
 	},
 
 	Arguments: []cmds.Argument{
-		cmds.FileArg("data", true, false, "Data to be stored as a DAG object.").EnableStdin(),
+		cmds.FileArg("data", true, false, "data to be stored as a DAG object.").EnableStdin(),
 	},
 	Options: []cmds.Option{
 		cmds.StringOption(inputencOptionName, "Encoding type of input data. One of: {\"protobuf\", \"json\"}.").WithDefault("json"),

core/commands/object/patch.go

@@ -40,13 +40,13 @@ Example:
 	$ echo "hello" | btfs object patch $HASH append-data
 
 NOTE: This does not append data to a file - it modifies the actual raw
-data within an object. Objects have a max size of 1MB and objects larger than
+data within an object. ToDeleteObjects have a max size of 1MB and objects larger than
 the limit will not be respected by the network.
 `,
 	},
 	Arguments: []cmds.Argument{
 		cmds.StringArg("root", true, false, "The hash of the node to modify."),
-		cmds.FileArg("data", true, false, "Data to append.").EnableStdin(),
+		cmds.FileArg("data", true, false, "data to append.").EnableStdin(),
 	},
 	Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
 		api, err := cmdenv.GetApi(env, req)

core/commands/refs.go

@@ -296,7 +296,7 @@ func (rw *RefWriter) visit(c cid.Cid, depth int) (bool, bool) {
 	// Unique == true && depth < MaxDepth (or unlimited) from this point
 
 	// Branch pruning cases:
-	// - We saw the Cid before and either:
+	// - We saw the CID before and either:
 	//   - Depth is unlimited (MaxDepth = -1)
 	//   - We saw it higher (smaller depth) in the DAG (means we must have
 	//     explored deep enough before)

core/corehttp/gateway/gateway.go

@@ -92,7 +92,7 @@ type IPFSBackend interface {
 	// Get returns a GetResponse with UnixFS file, directory or a block in IPLD
 	// format e.g., (DAG-)CBOR/JSON.
 	//
-	// Returned Directories are preferably a minimum info required for enumeration: Name, Size, and Cid.
+	// Returned Directories are preferably a minimum info required for enumeration: Name, Size, and CID.
 	//
 	// Optional ranges follow [HTTP Byte Ranges] notation and can be used for
 	// pre-fetching specific sections of a file or a block.

core/corehttp/gateway/gateway_test.go

@@ -418,7 +418,7 @@ func TestIPNSHostnameRedirect(t *testing.T) {
 // 	assert.Contains(t, s, "<a class=\"btfs-hash\" translate=\"no\" href=\"https://cid.btfs.tech/#", "expected links to cid.btfs.tech in CID column when on DNSLink website")
 // 	assert.Contains(t, s, "<a href=\"/foo%3F%20%23%3C%27/..\">", "expected backlink in directory listing")
 // 	assert.Contains(t, s, "<a href=\"/foo%3F%20%23%3C%27/file.txt\">", "expected file in directory listing")
-// 	assert.Contains(t, s, s, k2.Cid().String(), "expected hash in directory listing")
+// 	assert.Contains(t, s, s, k2.CID().String(), "expected hash in directory listing")
 
 // 	// make request to directory listing at root
 // 	req, err = http.NewRequest(http.MethodGet, ts.URL, nil)
@@ -440,7 +440,7 @@ func TestIPNSHostnameRedirect(t *testing.T) {
 // 	assert.Contains(t, s, "<a href=\"/file.txt\">", "expected file in directory listing")
 // 	// https://github.com/btfs/dir-index-html/issues/42
 // 	assert.Contains(t, s, "<a class=\"btfs-hash\" translate=\"no\" href=\"https://cid.btfs.tech/#", "expected links to cid.btfs.tech in CID column when on DNSLink website")
-// 	assert.Contains(t, s, k.Cid().String(), "expected hash in directory listing")
+// 	assert.Contains(t, s, k.CID().String(), "expected hash in directory listing")
 
 // 	// make request to directory listing
 // 	req, err = http.NewRequest(http.MethodGet, ts.URL+"/foo%3F%20%23%3C%27/bar/", nil)
@@ -460,7 +460,7 @@ func TestIPNSHostnameRedirect(t *testing.T) {
 // 	assert.True(t, matchPathOrBreadcrumbs(s, "/btns/<a href=\"//example.net/\">example.net</a>/<a href=\"//example.net/foo%3F%20%23%3C%27\">foo? #&lt;&#39;</a>/<a href=\"//example.net/foo%3F%20%23%3C%27/bar\">bar</a>"), "expected a path in directory listing")
 // 	assert.Contains(t, s, "<a href=\"/foo%3F%20%23%3C%27/bar/..\">", "expected backlink in directory listing")
 // 	assert.Contains(t, s, "<a href=\"/foo%3F%20%23%3C%27/bar/file.txt\">", "expected file in directory listing")
-// 	assert.Contains(t, s, k3.Cid().String(), "expected hash in directory listing")
+// 	assert.Contains(t, s, k3.CID().String(), "expected hash in directory listing")
 // }
 
 func TestPretty404(t *testing.T) {

fuse/ipns/ipns_test.go

@@ -66,10 +66,10 @@ func verifyFile(t *testing.T, path string, wantData []byte) {
 		t.Fatal(err)
 	}
 	if len(isData) != len(wantData) {
-		t.Fatal("Data not equal - length check failed")
+		t.Fatal("data not equal - length check failed")
 	}
 	if !bytes.Equal(isData, wantData) {
-		t.Fatal("Data not equal")
+		t.Fatal("data not equal")
 	}
 }
 
@@ -328,7 +328,7 @@ func TestAppendFile(t *testing.T) {
 		t.Fatal(err)
 	}
 	if !bytes.Equal(rbuf, data) {
-		t.Fatal("Data inconsistent!")
+		t.Fatal("data inconsistent!")
 	}
 }
 
@@ -458,7 +458,7 @@ func TestFSThrash(t *testing.T) {
 		}
 
 		if !bytes.Equal(data, out) {
-			t.Errorf("Data didn't match in %s: expected %v, got %v", name, data, out)
+			t.Errorf("data didn't match in %s: expected %v, got %v", name, data, out)
 		}
 	}
 }

fuse/readonly/readonly_unix.go

@@ -272,7 +272,7 @@ func (s *Node) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadR
 	if err != nil {
 		return err
 	}
-	// Data has a capacity of Size
+	// data has a capacity of Size
 	buf := resp.Data[:int(req.Size)]
 	n, err := io.ReadFull(r, buf)
 	resp.Data = buf[:n]

s3/api/requests/parsers_multipart.go

@@ -3,7 +3,6 @@ package requests
 import (
 	"errors"
 	"net/http"
-
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/bittorrent/go-btfs/s3/api/contexts"
 	"github.com/bittorrent/go-btfs/s3/api/services/object"

s3/api/requests/parsers_object.go

@@ -3,7 +3,6 @@ package requests
 import (
 	"errors"
 	"net/http"
-
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/bittorrent/go-btfs/s3/api/contexts"
 	"github.com/bittorrent/go-btfs/s3/api/services/object"

settlement/swap/vault/cashout.go

@@ -134,7 +134,7 @@ func cashoutActionKey(vault common.Address, token common.Address) string {
 //
 //	output, err := s.transactionService.Call(ctx, &transaction.TxRequest{
 //		To:   &vault,
-//		Data: callData,
+//		data: callData,
 //	})
 //	if err != nil {
 //		return nil, err
@@ -198,7 +198,7 @@ func (s *cashoutService) CashCheque(ctx context.Context, vault, recipient common
 	//}
 	//request := &transaction.TxRequest{
 	//	To:          &vault,
-	//	Data:        callData,
+	//	data:        callData,
 	//	Value:       big.NewInt(0),
 	//	Description: "cheque cashout",
 	//}

settlement/swap/vault/factory_test.go

@@ -207,12 +207,12 @@ func TestFactoryVerifyVault(t *testing.T) {
 // 					Status: 1,
 // 					Logs: []*types.Log{
 // 						{
-// 							Data: logData,
+// 							data: logData,
 // 						},
 // 						{
 // 							Address: factoryAddress,
 // 							Topics:  []common.Hash{simpleSwapDeployedEvent.ID},
-// 							Data:    logData,
+// 							data:    logData,
 // 						},
 // 					},
 // 				}, nil

settlement/swap/vault/vault.go

@@ -526,7 +526,7 @@ func (s *service) LastCheques(token common.Address) (map[common.Address]*SignedC
 //
 //	request := &transaction.TxRequest{
 //		To:          &s.address,
-//		Data:        callData,
+//		data:        callData,
 //		Value:       big.NewInt(0),
 //		Description: fmt.Sprintf("vault withdrawal of %d WBTT", amount),
 //	}