Merge branch 'master' into feat/bitswap-internal-notifications

Brian Tiger Chow · Brian Tiger Chow · commit 6f82f7bb8853 · 2014-09-12T13:57:50.000-07:00
diff --git a/cmd/ipfs/init.go b/cmd/ipfs/init.go
@@ -43,7 +43,7 @@ func initCmd(c *commander.Command, inp []string) error {
 	}
 	cfg := new(config.Config)
 
-	cfg.Datastore = new(config.Datastore)
+	cfg.Datastore = config.Datastore{}
 	dspath, err := u.TildeExpansion("~/.go-ipfs/datastore")
 	if err != nil {
 		return err
@@ -72,7 +72,7 @@ func initCmd(c *commander.Command, inp []string) error {
 	}
 	cfg.Identity.PrivKey = base64.StdEncoding.EncodeToString(skbytes)
 
-	id, err := identify.IdFromPubKey(pk)
+	id, err := identify.IDFromPubKey(pk)
 	if err != nil {
 		return err
 	}
diff --git a/config/config.go b/config/config.go
@@ -30,7 +30,7 @@ type SavedPeer struct {
 // Config is used to load IPFS config files.
 type Config struct {
 	Identity  *Identity
-	Datastore *Datastore
+	Datastore Datastore
 	Peers     []*SavedPeer
 }
 
diff --git a/config/config_test.go b/config/config_test.go
@@ -1,17 +1,24 @@
 package config
 
 import (
-	"fmt"
 	"testing"
 )
 
 func TestConfig(t *testing.T) {
-
-	cfg, err := Load(".ipfsconfig")
+	const filename = ".ipfsconfig"
+	const dsPath = "/path/to/datastore"
+	cfgWritten := new(Config)
+	cfgWritten.Datastore.Path = dsPath
+	err := WriteConfigFile(filename, cfgWritten)
+	if err != nil {
+		t.Error(err)
+	}
+	cfgRead, err := Load(filename)
 	if err != nil {
 		t.Error(err)
 		return
 	}
-
-	fmt.Printf(cfg.Datastore.Path)
+	if cfgWritten.Datastore.Path != cfgRead.Datastore.Path {
+		t.Fail()
+	}
 }
diff --git a/core/core_test.go b/core/core_test.go
@@ -7,34 +7,34 @@ import (
 )
 
 func TestInitialization(t *testing.T) {
-	id :=  &config.Identity {
-		PeerID: "QmNgdzLieYi8tgfo2WfTUzNVH5hQK9oAYGVf6dxN12NrHt",
+	id := &config.Identity{
+		PeerID:  "QmNgdzLieYi8tgfo2WfTUzNVH5hQK9oAYGVf6dxN12NrHt",
 		Address: "/ip4/127.0.0.1/tcp/8000",
 		PrivKey: "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",
 	}
 
 	good := []*config.Config{
-		&config.Config {
+		&config.Config{
 			Identity: id,
-			Datastore: &config.Datastore{
+			Datastore: config.Datastore{
 				Type: "memory",
 			},
 		},
 
-		&config.Config {
+		&config.Config{
 			Identity: id,
-			Datastore: &config.Datastore {
+			Datastore: config.Datastore{
 				Type: "leveldb",
 				Path: ".testdb",
 			},
 		},
 	}
 
 	bad := []*config.Config{
-		&config.Config{Identity: id, Datastore: &config.Datastore{}},
-		&config.Config{Identity: id, Datastore: &config.Datastore{Type: "badtype"}},
+		&config.Config{Identity: id, Datastore: config.Datastore{}},
+		&config.Config{Identity: id, Datastore: config.Datastore{Type: "badtype"}},
 		&config.Config{},
-		&config.Config{Datastore: &config.Datastore{Type: "memory"}},
+		&config.Config{Datastore: config.Datastore{Type: "memory"}},
 		nil,
 	}
 
diff --git a/core/datastore.go b/core/datastore.go
@@ -2,13 +2,14 @@ package core
 
 import (
 	"fmt"
+
 	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"
 	lds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/leveldb"
 	config "github.com/jbenet/go-ipfs/config"
 )
 
-func makeDatastore(cfg *config.Datastore) (ds.Datastore, error) {
-	if cfg == nil || len(cfg.Type) == 0 {
+func makeDatastore(cfg config.Datastore) (ds.Datastore, error) {
+	if len(cfg.Type) == 0 {
 		return nil, fmt.Errorf("config datastore.type required")
 	}
 
@@ -22,7 +23,7 @@ func makeDatastore(cfg *config.Datastore) (ds.Datastore, error) {
 	return nil, fmt.Errorf("Unknown datastore type: %s", cfg.Type)
 }
 
-func makeLevelDBDatastore(cfg *config.Datastore) (ds.Datastore, error) {
+func makeLevelDBDatastore(cfg config.Datastore) (ds.Datastore, error) {
 	if len(cfg.Path) == 0 {
 		return nil, fmt.Errorf("config datastore.path required for leveldb")
 	}
diff --git a/identify/identify.go b/identify/identify.go
@@ -1,4 +1,4 @@
-// The identify package handles how peers identify with eachother upon
+// Package identify handles how peers identify with eachother upon
 // connection to the network
 package identify
 
@@ -31,7 +31,7 @@ var SupportedHashes = "SHA256,SHA512,SHA1"
 // ErrUnsupportedKeyType is returned when a private key cast/type switch fails.
 var ErrUnsupportedKeyType = errors.New("unsupported key type")
 
-// Perform initial communication with this peer to share node ID's and
+// Performs initial communication with this peer to share node ID's and
 // initiate communication.  (secureIn, secureOut, error)
 func Handshake(self, remote *peer.Peer, in, out chan []byte) (chan []byte, chan []byte, error) {
 	// Generate and send Hello packet.
@@ -74,7 +74,7 @@ func Handshake(self, remote *peer.Peer, in, out chan []byte) (chan []byte, chan
 		return nil, nil, err
 	}
 
-	remote.ID, err = IdFromPubKey(remote.PubKey)
+	remote.ID, err = IDFromPubKey(remote.PubKey)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -239,7 +239,8 @@ func secureOutProxy(out, secureOut chan []byte, hashType string, mIV, mCKey, mMK
 	}
 }
 
-func IdFromPubKey(pk ci.PubKey) (peer.ID, error) {
+// IDFromPubKey returns Nodes ID given its public key
+func IDFromPubKey(pk ci.PubKey) (peer.ID, error) {
 	b, err := pk.Bytes()
 	if err != nil {
 		return nil, err
diff --git a/identify/identify_test.go b/identify/identify_test.go
@@ -20,7 +20,7 @@ func TestHandshake(t *testing.T) {
 	cha := make(chan []byte, 5)
 	chb := make(chan []byte, 5)
 
-	ida, err := IdFromPubKey(pka)
+	ida, err := IDFromPubKey(pka)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -30,7 +30,7 @@ func TestHandshake(t *testing.T) {
 		PrivKey: ska,
 	}
 
-	idb, err := IdFromPubKey(pkb)
+	idb, err := IDFromPubKey(pkb)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/importer/splitting.go b/importer/splitting.go
@@ -34,12 +34,13 @@ func SplitterBySize(n int) BlockSplitter {
 }
 
 // TODO: this should take a reader, not a byte array. what if we're splitting a 3TB file?
+//Rabin Fingerprinting for file chunking
 func Rabin(b []byte) [][]byte {
 	var out [][]byte
 	windowsize := uint64(48)
-	chunk_max := 1024 * 16
-	min_blk_size := 2048
-	blk_beg_i := 0
+	chunkMax := 1024 * 16
+	minBlkSize := 2048
+	blkBegI := 0
 	prime := uint64(61)
 
 	var poly uint64
@@ -63,21 +64,21 @@ func Rabin(b []byte) [][]byte {
 		poly = (poly * prime) + cur
 		curchecksum -= (uint64(b[i-1]) * prime)
 
-		if i-blk_beg_i >= chunk_max {
+		if i-blkBegI >= chunkMax {
 			// push block
-			out = append(out, b[blk_beg_i:i])
-			blk_beg_i = i
+			out = append(out, b[blkBegI:i])
+			blkBegI = i
 		}
 
 		// first 13 bits of polynomial are 0
-		if poly%8192 == 0 && i-blk_beg_i >= min_blk_size {
+		if poly%8192 == 0 && i-blkBegI >= minBlkSize {
 			// push block
-			out = append(out, b[blk_beg_i:i])
-			blk_beg_i = i
+			out = append(out, b[blkBegI:i])
+			blkBegI = i
 		}
 	}
-	if i > blk_beg_i {
-		out = append(out, b[blk_beg_i:])
+	if i > blkBegI {
+		out = append(out, b[blkBegI:])
 	}
 	return out
 }
diff --git a/merkledag/dagreader.go b/merkledag/dagreader.go
@@ -9,7 +9,7 @@ import (
 	u "github.com/jbenet/go-ipfs/util"
 )
 
-var ErrIsDir = errors.New("this dag node is a directory.")
+var ErrIsDir = errors.New("this dag node is a directory")
 
 // DagReader provides a way to easily read the data contained in a dag.
 type DagReader struct {
diff --git a/peer/peer.go b/peer/peer.go
@@ -16,7 +16,7 @@ import (
 // ID is a byte slice representing the identity of a peer.
 type ID mh.Multihash
 
-// Utililty function for comparing two peer ID's
+// Equal is utililty function for comparing two peer ID's
 func (id ID) Equal(other ID) bool {
 	return bytes.Equal(id, other)
 }
diff --git a/routing/dht/dht_test.go b/routing/dht/dht_test.go
@@ -35,7 +35,7 @@ func setupDHTS(n int, t *testing.T) ([]*ma.Multiaddr, []*peer.Peer, []*IpfsDHT)
 		}
 		p.PubKey = pk
 		p.PrivKey = sk
-		id, err := identify.IdFromPubKey(pk)
+		id, err := identify.IDFromPubKey(pk)
 		if err != nil {
 			panic(err)
 		}
@@ -67,7 +67,7 @@ func makePeer(addr *ma.Multiaddr) *peer.Peer {
 	}
 	p.PrivKey = sk
 	p.PubKey = pk
-	id, err := identify.IdFromPubKey(pk)
+	id, err := identify.IDFromPubKey(pk)
 	if err != nil {
 		panic(err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func initCmd(c *commander.Command, inp []string) error {`
`43`	`43`	`}`
`44`	`44`	`cfg := new(config.Config)`
`45`	`45`
`46`		`- cfg.Datastore = new(config.Datastore)`
	`46`	`+ cfg.Datastore = config.Datastore{}`
`47`	`47`	`dspath, err := u.TildeExpansion("~/.go-ipfs/datastore")`
`48`	`48`	`if err != nil {`
`49`	`49`	`return err`
`@@ -72,7 +72,7 @@ func initCmd(c *commander.Command, inp []string) error {`
`72`	`72`	`}`
`73`	`73`	`cfg.Identity.PrivKey = base64.StdEncoding.EncodeToString(skbytes)`
`74`	`74`
`75`		`- id, err := identify.IdFromPubKey(pk)`
	`75`	`+ id, err := identify.IDFromPubKey(pk)`
`76`	`76`	`if err != nil {`
`77`	`77`	`return err`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ type SavedPeer struct {`
`30`	`30`	`// Config is used to load IPFS config files.`
`31`	`31`	`type Config struct {`
`32`	`32`	`Identity *Identity`
`33`		`- Datastore *Datastore`
	`33`	`+ Datastore Datastore`
`34`	`34`	`Peers []*SavedPeer`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,14 @@ package core`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
	`5`	`+`
`5`	`6`	`ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go"`
`6`	`7`	`lds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/datastore.go/leveldb"`
`7`	`8`	`config "github.com/jbenet/go-ipfs/config"`
`8`	`9`	`)`
`9`	`10`
`10`		`-func makeDatastore(cfg *config.Datastore) (ds.Datastore, error) {`
`11`		`- if cfg == nil \|\| len(cfg.Type) == 0 {`
	`11`	`+func makeDatastore(cfg config.Datastore) (ds.Datastore, error) {`
	`12`	`+ if len(cfg.Type) == 0 {`
`12`	`13`	`return nil, fmt.Errorf("config datastore.type required")`
`13`	`14`	`}`
`14`	`15`
`@@ -22,7 +23,7 @@ func makeDatastore(cfg *config.Datastore) (ds.Datastore, error) {`
`22`	`23`	`return nil, fmt.Errorf("Unknown datastore type: %s", cfg.Type)`
`23`	`24`	`}`
`24`	`25`
`25`		`-func makeLevelDBDatastore(cfg *config.Datastore) (ds.Datastore, error) {`
	`26`	`+func makeLevelDBDatastore(cfg config.Datastore) (ds.Datastore, error) {`
`26`	`27`	`if len(cfg.Path) == 0 {`
`27`	`28`	`return nil, fmt.Errorf("config datastore.path required for leveldb")`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ func TestHandshake(t *testing.T) {`
`20`	`20`	`cha := make(chan []byte, 5)`
`21`	`21`	`chb := make(chan []byte, 5)`
`22`	`22`
`23`		`- ida, err := IdFromPubKey(pka)`
	`23`	`+ ida, err := IDFromPubKey(pka)`
`24`	`24`	`if err != nil {`
`25`	`25`	`t.Fatal(err)`
`26`	`26`	`}`
`@@ -30,7 +30,7 @@ func TestHandshake(t *testing.T) {`
`30`	`30`	`PrivKey: ska,`
`31`	`31`	`}`
`32`	`32`
`33`		`- idb, err := IdFromPubKey(pkb)`
	`33`	`+ idb, err := IDFromPubKey(pkb)`
`34`	`34`	`if err != nil {`
`35`	`35`	`t.Fatal(err)`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`u "github.com/jbenet/go-ipfs/util"`
`10`	`10`	`)`
`11`	`11`
`12`		`-var ErrIsDir = errors.New("this dag node is a directory.")`
	`12`	`+var ErrIsDir = errors.New("this dag node is a directory")`
`13`	`13`
`14`	`14`	`// DagReader provides a way to easily read the data contained in a dag.`
`15`	`15`	`type DagReader struct {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`// ID is a byte slice representing the identity of a peer.`
`17`	`17`	`type ID mh.Multihash`
`18`	`18`
`19`		`-// Utililty function for comparing two peer ID's`
	`19`	`+// Equal is utililty function for comparing two peer ID's`
`20`	`20`	`func (id ID) Equal(other ID) bool {`
`21`	`21`	`return bytes.Equal(id, other)`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func setupDHTS(n int, t testing.T) ([]ma.Multiaddr, []peer.Peer, []IpfsDHT)`
`35`	`35`	`}`
`36`	`36`	`p.PubKey = pk`
`37`	`37`	`p.PrivKey = sk`
`38`		`- id, err := identify.IdFromPubKey(pk)`
	`38`	`+ id, err := identify.IDFromPubKey(pk)`
`39`	`39`	`if err != nil {`
`40`	`40`	`panic(err)`
`41`	`41`	`}`
`@@ -67,7 +67,7 @@ func makePeer(addr ma.Multiaddr) peer.Peer {`
`67`	`67`	`}`
`68`	`68`	`p.PrivKey = sk`
`69`	`69`	`p.PubKey = pk`
`70`		`- id, err := identify.IdFromPubKey(pk)`
	`70`	`+ id, err := identify.IDFromPubKey(pk)`
`71`	`71`	`if err != nil {`
`72`	`72`	`panic(err)`
`73`	`73`	`}`