move dht record code into new package
Jeromy committed
Jan 17, 2015 at 02:50 UTC
c01452e5ea6b03ebeffe76246980d697bb973db7
6 files changed
+52
-39
routing/dht/dht.go
+2
-1
@@ -17,6 +17,7 @@ import (
17
routing "github.com/jbenet/go-ipfs/routing"
18
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
19
kb "github.com/jbenet/go-ipfs/routing/kbucket"
20
+ record "github.com/jbenet/go-ipfs/routing/record"
21
"github.com/jbenet/go-ipfs/thirdparty/eventlog"
22
u "github.com/jbenet/go-ipfs/util"
23
@@ -253,7 +254,7 @@ func (dht *IpfsDHT) putLocal(key u.Key, value []byte) error {
254
return err
255
}
256
256
- rec, err := MakePutRecord(sk, key, value)
257
+ rec, err := record.MakePutRecord(sk, key, value)
258
if err != nil {
259
return err
260
}
routing/dht/ext_test.go
+2
-1
@@ -11,6 +11,7 @@ import (
11
peer "github.com/jbenet/go-ipfs/p2p/peer"
12
routing "github.com/jbenet/go-ipfs/routing"
13
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
14
+ record "github.com/jbenet/go-ipfs/routing/record"
15
u "github.com/jbenet/go-ipfs/util"
16
17
context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
@@ -104,7 +105,7 @@ func TestGetFailures(t *testing.T) {
105
t.Fatal(err)
106
}
107
107
- rec, err := MakePutRecord(sk, u.Key(str), []byte("blah"))
108
+ rec, err := record.MakePutRecord(sk, u.Key(str), []byte("blah"))
109
if err != nil {
110
t.Fatal(err)
111
}
routing/dht/records.go
+2
-34
@@ -7,11 +7,11 @@ import (
7
"strings"
8
9
"github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/go.net/context"
10
- "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
10
11
ci "github.com/jbenet/go-ipfs/p2p/crypto"
12
"github.com/jbenet/go-ipfs/p2p/peer"
13
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
14
+ record "github.com/jbenet/go-ipfs/routing/record"
15
u "github.com/jbenet/go-ipfs/util"
16
ctxutil "github.com/jbenet/go-ipfs/util/ctx"
17
)
@@ -34,38 +34,6 @@ func KeyForPublicKey(id peer.ID) u.Key {
34
return u.Key("/pk/" + string(id))
35
}
36
37
-// RecordBlobForSig returns the blob protected by the record signature
38
-func RecordBlobForSig(r *pb.Record) []byte {
39
- k := []byte(r.GetKey())
40
- v := []byte(r.GetValue())
41
- a := []byte(r.GetAuthor())
42
- return bytes.Join([][]byte{k, v, a}, []byte{})
43
-}
44
-
45
-// MakePutRecord creates and signs a dht record for the given key/value pair
46
-func MakePutRecord(sk ci.PrivKey, key u.Key, value []byte) (*pb.Record, error) {
47
- record := new(pb.Record)
48
-
49
- record.Key = proto.String(string(key))
50
- record.Value = value
51
-
52
- pkh, err := sk.GetPublic().Hash()
53
- if err != nil {
54
- return nil, err
55
- }
56
-
57
- record.Author = proto.String(string(pkh))
58
- blob := RecordBlobForSig(record)
59
-
60
- sig, err := sk.Sign(blob)
61
- if err != nil {
62
- return nil, err
63
- }
64
-
65
- record.Signature = sig
66
- return record, nil
67
-}
68
-
37
func (dht *IpfsDHT) getPublicKeyOnline(ctx context.Context, p peer.ID) (ci.PubKey, error) {
38
log.Debugf("getPublicKey for: %s", p)
39
@@ -179,7 +147,7 @@ func (dht *IpfsDHT) verifyRecordOnline(ctx context.Context, r *pb.Record) error
147
// it might be useful for users to have access to.
148
func (dht *IpfsDHT) verifyRecord(r *pb.Record, pk ci.PubKey) error {
149
// First, validate the signature
182
- blob := RecordBlobForSig(r)
150
+ blob := record.RecordBlobForSig(r)
151
ok, err := pk.Verify(blob, r.GetSignature())
152
if err != nil {
153
log.Error("Signature verify failed.")
routing/dht/routing.go
+2
-1
@@ -12,6 +12,7 @@ import (
12
"github.com/jbenet/go-ipfs/routing"
13
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
14
kb "github.com/jbenet/go-ipfs/routing/kbucket"
15
+ record "github.com/jbenet/go-ipfs/routing/record"
16
u "github.com/jbenet/go-ipfs/util"
17
errors "github.com/jbenet/go-ipfs/util/debugerror"
18
pset "github.com/jbenet/go-ipfs/util/peerset"
@@ -41,7 +42,7 @@ func (dht *IpfsDHT) PutValue(ctx context.Context, key u.Key, value []byte) error
42
return err
43
}
44
44
- rec, err := MakePutRecord(sk, key, value)
45
+ rec, err := record.MakePutRecord(sk, key, value)
46
if err != nil {
47
log.Error("Creation of record failed!")
48
return err
routing/offline/offline.go
+2
-2
@@ -10,8 +10,8 @@ import (
10
ci "github.com/jbenet/go-ipfs/p2p/crypto"
11
"github.com/jbenet/go-ipfs/p2p/peer"
12
routing "github.com/jbenet/go-ipfs/routing"
13
- dht "github.com/jbenet/go-ipfs/routing/dht"
13
pb "github.com/jbenet/go-ipfs/routing/dht/pb"
14
+ record "github.com/jbenet/go-ipfs/routing/record"
15
eventlog "github.com/jbenet/go-ipfs/thirdparty/eventlog"
16
u "github.com/jbenet/go-ipfs/util"
17
)
@@ -36,7 +36,7 @@ type offlineRouting struct {
36
}
37
38
func (c *offlineRouting) PutValue(ctx context.Context, key u.Key, val []byte) error {
39
- rec, err := dht.MakePutRecord(c.sk, key, val)
39
+ rec, err := record.MakePutRecord(c.sk, key, val)
40
if err != nil {
41
return err
42
}
routing/record/record.go
new
+42
@@ -0,0 +1,42 @@
1
+package record
2
+
3
+import (
4
+ "bytes"
5
+ "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
6
+
7
+ ci "github.com/jbenet/go-ipfs/p2p/crypto"
8
+ pb "github.com/jbenet/go-ipfs/routing/dht/pb"
9
+ u "github.com/jbenet/go-ipfs/util"
10
+)
11
+
12
+// MakePutRecord creates and signs a dht record for the given key/value pair
13
+func MakePutRecord(sk ci.PrivKey, key u.Key, value []byte) (*pb.Record, error) {
14
+ record := new(pb.Record)
15
+
16
+ record.Key = proto.String(string(key))
17
+ record.Value = value
18
+
19
+ pkh, err := sk.GetPublic().Hash()
20
+ if err != nil {
21
+ return nil, err
22
+ }
23
+
24
+ record.Author = proto.String(string(pkh))
25
+ blob := RecordBlobForSig(record)
26
+
27
+ sig, err := sk.Sign(blob)
28
+ if err != nil {
29
+ return nil, err
30
+ }
31
+
32
+ record.Signature = sig
33
+ return record, nil
34
+}
35
+
36
+// RecordBlobForSig returns the blob protected by the record signature
37
+func RecordBlobForSig(r *pb.Record) []byte {
38
+ k := []byte(r.GetKey())
39
+ v := []byte(r.GetValue())
40
+ a := []byte(r.GetAuthor())
41
+ return bytes.Join([][]byte{k, v, a}, []byte{})
42
+}