adder: tweaks

License: MIT Signed-off-by: Kevin Atkinson <k@kevina.org>
ipfs · Mar 8, 2017 · 2ba6d8a · 2ba6d8a
1 parent 921afcc
commit 2ba6d8a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/core/commands/add.go b/core/commands/add.go
@@ -87,7 +87,7 @@ You can now refer to the added file in a gateway, like so:
 		cmds.BoolOption(rawLeavesOptionName, "Use raw blocks for leaf nodes. (experimental)"),
 		cmds.BoolOption(noCopyOptionName, "Add the file using filestore. (experimental)"),
 		cmds.BoolOption(fstoreCacheOptionName, "Check the filestore for pre-existing blocks. (experimental)"),
-		cmds.IntOption(cidVersionOptionName, "Cid version. (experimental)").Default(0),
+		cmds.IntOption(cidVersionOptionName, "Cid version. Non-zero value will change default of 'raw-leaves' to true. (experimental)").Default(0),
 	},
 	PreRun: func(req cmds.Request) error {
 		quiet, _, _ := req.Option(quietOptionName).Bool()

diff --git a/importer/helpers/dagbuilder.go b/importer/helpers/dagbuilder.go
@@ -35,7 +35,7 @@ type DagBuilderParams struct {
 	// instead of using the unixfs TRaw type
 	RawLeaves bool
 
-	// Prefix specifies cid version and hashing function
+	// CID Version to use
 	CidVersion dag.CidVersion
 
 	// DAGService to write blocks to (required)

diff --git a/merkledag/cidversion.go b/merkledag/cidversion.go
@@ -9,12 +9,15 @@ type CidVersion struct {
 	version uint64
 }
 
+var (
+	CID0 = CidVersion{0}
+	CID1 = CidVersion{1}
+)
+
 func NewCidVersion(version int) (CidVersion, error) {
 	switch version {
-	case 0:
-		return CidVersion{0}, nil
-	case 1:
-		return CidVersion{1}, nil
+	case 0, 1:
+		return CidVersion{uint64(version)}, nil
 	default:
 		return CidVersion{}, fmt.Errorf("unknown CID version: %d", version)
 	}
@@ -23,4 +26,3 @@ func NewCidVersion(version int) (CidVersion, error) {
 func (v CidVersion) Version() uint64 {
 	return v.version
 }
-