omit slash from created dskeys, fix prefixLen discrepancy

ipfs · Jun 28, 2016 · 9121c86 · 9121c86
1 parent dfe0659
commit 9121c86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/flatfs.go b/flatfs.go
@@ -56,9 +56,10 @@ func New(path string, prefixLen int, sync bool) (*Datastore, error) {
 var padding = strings.Repeat("_", maxPrefixLen)
 
 func (fs *Datastore) encode(key datastore.Key) (dir, file string) {
-	prefix := (key.String() + padding)[:fs.prefixLen]
+	noslash := key.String()[1:]
+	prefix := (noslash + padding)[:fs.prefixLen]
 	dir = path.Join(fs.path, prefix)
-	file = path.Join(dir, key.String()+extension)
+	file = path.Join(dir, noslash+extension)
 	return dir, file
 }
 

diff --git a/flatfs_test.go b/flatfs_test.go
@@ -152,7 +152,7 @@ func TestStorage(t *testing.T) {
 	defer cleanup()
 
 	const prefixLen = 2
-	const prefix = "q"
+	const prefix = "qu"
 	const target = prefix + string(os.PathSeparator) + "quux.data"
 	fs, err := flatfs.New(temp, prefixLen, false)
 	if err != nil {