refactor symbol
Juan Batiz-Benet committed
Sep 16, 2014 at 00:57 UTC
e872482aa7a4a991f8f8a02acbe0e256218302bd
1 file changed
+21
-21
routing/dht/dht.go
+21
-21
@@ -280,7 +280,7 @@ func (dht *IpfsDHT) handleGetValue(p *peer.Peer, pmes *Message) (*Message, error
280
}
281
282
// Store a value in this peer local storage
283
-func (dht *IpfsDHT) handlePutValue(p *peer.Peer, pmes *PBDHTMessage) {
283
+func (dht *IpfsDHT) handlePutValue(p *peer.Peer, pmes *Message) {
284
dht.dslock.Lock()
285
defer dht.dslock.Unlock()
286
dskey := ds.NewKey(pmes.GetKey())
@@ -291,7 +291,7 @@ func (dht *IpfsDHT) handlePutValue(p *peer.Peer, pmes *PBDHTMessage) {
291
}
292
}
293
294
-func (dht *IpfsDHT) handlePing(p *peer.Peer, pmes *PBDHTMessage) {
294
+func (dht *IpfsDHT) handlePing(p *peer.Peer, pmes *Message) {
295
u.DOut("[%s] Responding to ping from [%s]!\n", dht.self.ID.Pretty(), p.ID.Pretty())
296
resp := Message{
297
Type: pmes.GetType(),
@@ -302,7 +302,7 @@ func (dht *IpfsDHT) handlePing(p *peer.Peer, pmes *PBDHTMessage) {
302
dht.netChan.Outgoing <- swarm.NewMessage(p, resp.ToProtobuf())
303
}
304
305
-func (dht *IpfsDHT) handleFindPeer(p *peer.Peer, pmes *PBDHTMessage) {
305
+func (dht *IpfsDHT) handleFindPeer(p *peer.Peer, pmes *Message) {
306
resp := Message{
307
Type: pmes.GetType(),
308
ID: pmes.GetId(),
@@ -335,9 +335,9 @@ func (dht *IpfsDHT) handleFindPeer(p *peer.Peer, pmes *PBDHTMessage) {
335
resp.Success = true
336
}
337
338
-func (dht *IpfsDHT) handleGetProviders(p *peer.Peer, pmes *PBDHTMessage) {
338
+func (dht *IpfsDHT) handleGetProviders(p *peer.Peer, pmes *Message) {
339
resp := Message{
340
- Type: PBDHTMessage_GET_PROVIDERS,
340
+ Type: Message_GET_PROVIDERS,
341
Key: pmes.GetKey(),
342
ID: pmes.GetId(),
343
Response: true,
@@ -378,7 +378,7 @@ type providerInfo struct {
378
Value *peer.Peer
379
}
380
381
-func (dht *IpfsDHT) handleAddProvider(p *peer.Peer, pmes *PBDHTMessage) {
381
+func (dht *IpfsDHT) handleAddProvider(p *peer.Peer, pmes *Message) {
382
key := u.Key(pmes.GetKey())
383
u.DOut("[%s] Adding [%s] as a provider for '%s'\n", dht.self.ID.Pretty(), p.ID.Pretty(), peer.ID(key).Pretty())
384
dht.providers.AddProvider(key, p)
@@ -393,7 +393,7 @@ func (dht *IpfsDHT) Halt() {
393
}
394
395
// NOTE: not yet finished, low priority
396
-func (dht *IpfsDHT) handleDiagnostic(p *peer.Peer, pmes *PBDHTMessage) {
396
+func (dht *IpfsDHT) handleDiagnostic(p *peer.Peer, pmes *Message) {
397
seq := dht.routingTables[0].NearestPeers(kb.ConvertPeerID(dht.self.ID), 10)
398
listenChan := dht.listener.Listen(pmes.GetId(), len(seq), time.Second*30)
399
@@ -415,7 +415,7 @@ func (dht *IpfsDHT) handleDiagnostic(p *peer.Peer, pmes *PBDHTMessage) {
415
//Timeout, return what we have
416
goto out
417
case reqResp := <-listenChan:
418
- pmesOut := new(PBDHTMessage)
418
+ pmesOut := new(Message)
419
err := proto.Unmarshal(reqResp.Data, pmesOut)
420
if err != nil {
421
// It broke? eh, whatever, keep going
@@ -428,7 +428,7 @@ func (dht *IpfsDHT) handleDiagnostic(p *peer.Peer, pmes *PBDHTMessage) {
428
429
out:
430
resp := Message{
431
- Type: PBDHTMessage_DIAGNOSTIC,
431
+ Type: Message_DIAGNOSTIC,
432
ID: pmes.GetId(),
433
Value: buf.Bytes(),
434
Response: true,
@@ -481,9 +481,9 @@ func (dht *IpfsDHT) getValueOrPeers(p *peer.Peer, key u.Key, timeout time.Durati
481
}
482
483
// getValueSingle simply performs the get value RPC with the given parameters
484
-func (dht *IpfsDHT) getValueSingle(p *peer.Peer, key u.Key, timeout time.Duration, level int) (*PBDHTMessage, error) {
484
+func (dht *IpfsDHT) getValueSingle(p *peer.Peer, key u.Key, timeout time.Duration, level int) (*Message, error) {
485
pmes := Message{
486
- Type: PBDHTMessage_GET_VALUE,
486
+ Type: Message_GET_VALUE,
487
Key: string(key),
488
Value: []byte{byte(level)},
489
ID: swarm.GenerateMessageID(),
@@ -507,7 +507,7 @@ func (dht *IpfsDHT) getValueSingle(p *peer.Peer, key u.Key, timeout time.Duratio
507
}
508
roundtrip := time.Since(t)
509
resp.Peer.SetLatency(roundtrip)
510
- pmesOut := new(PBDHTMessage)
510
+ pmesOut := new(Message)
511
err := proto.Unmarshal(resp.Data, pmesOut)
512
if err != nil {
513
return nil, err
@@ -521,7 +521,7 @@ func (dht *IpfsDHT) getValueSingle(p *peer.Peer, key u.Key, timeout time.Duratio
521
// one to get the value from? Or just connect to one at a time until we get a
522
// successful connection and request the value from it?
523
func (dht *IpfsDHT) getFromPeerList(key u.Key, timeout time.Duration,
524
- peerlist []*PBDHTMessage_PBPeer, level int) ([]byte, error) {
524
+ peerlist []*Message_PBPeer, level int) ([]byte, error) {
525
for _, pinfo := range peerlist {
526
p, _ := dht.Find(peer.ID(pinfo.GetId()))
527
if p == nil {
@@ -597,9 +597,9 @@ func (dht *IpfsDHT) Find(id peer.ID) (*peer.Peer, *kb.RoutingTable) {
597
return nil, nil
598
}
599
600
-func (dht *IpfsDHT) findPeerSingle(p *peer.Peer, id peer.ID, timeout time.Duration, level int) (*PBDHTMessage, error) {
600
+func (dht *IpfsDHT) findPeerSingle(p *peer.Peer, id peer.ID, timeout time.Duration, level int) (*Message, error) {
601
pmes := Message{
602
- Type: PBDHTMessage_FIND_NODE,
602
+ Type: Message_FIND_NODE,
603
Key: string(id),
604
ID: swarm.GenerateMessageID(),
605
Value: []byte{byte(level)},
@@ -617,7 +617,7 @@ func (dht *IpfsDHT) findPeerSingle(p *peer.Peer, id peer.ID, timeout time.Durati
617
case resp := <-listenChan:
618
roundtrip := time.Since(t)
619
resp.Peer.SetLatency(roundtrip)
620
- pmesOut := new(PBDHTMessage)
620
+ pmesOut := new(Message)
621
err := proto.Unmarshal(resp.Data, pmesOut)
622
if err != nil {
623
return nil, err
@@ -633,9 +633,9 @@ func (dht *IpfsDHT) printTables() {
633
}
634
}
635
636
-func (dht *IpfsDHT) findProvidersSingle(p *peer.Peer, key u.Key, level int, timeout time.Duration) (*PBDHTMessage, error) {
636
+func (dht *IpfsDHT) findProvidersSingle(p *peer.Peer, key u.Key, level int, timeout time.Duration) (*Message, error) {
637
pmes := Message{
638
- Type: PBDHTMessage_GET_PROVIDERS,
638
+ Type: Message_GET_PROVIDERS,
639
Key: string(key),
640
ID: swarm.GenerateMessageID(),
641
Value: []byte{byte(level)},
@@ -652,7 +652,7 @@ func (dht *IpfsDHT) findProvidersSingle(p *peer.Peer, key u.Key, level int, time
652
return nil, u.ErrTimeout
653
case resp := <-listenChan:
654
u.DOut("FindProviders: got response.\n")
655
- pmesOut := new(PBDHTMessage)
655
+ pmesOut := new(Message)
656
err := proto.Unmarshal(resp.Data, pmesOut)
657
if err != nil {
658
return nil, err
@@ -663,7 +663,7 @@ func (dht *IpfsDHT) findProvidersSingle(p *peer.Peer, key u.Key, level int, time
663
}
664
665
// TODO: Could be done async
666
-func (dht *IpfsDHT) addPeerList(key u.Key, peers []*PBDHTMessage_PBPeer) []*peer.Peer {
666
+func (dht *IpfsDHT) addPeerList(key u.Key, peers []*Message_PBPeer) []*peer.Peer {
667
var provArr []*peer.Peer
668
for _, prov := range peers {
669
// Dont add outselves to the list
@@ -687,7 +687,7 @@ func (dht *IpfsDHT) addPeerList(key u.Key, peers []*PBDHTMessage_PBPeer) []*peer
687
return provArr
688
}
689
690
-func (dht *IpfsDHT) peerFromInfo(pbp *PBDHTMessage_PBPeer) (*peer.Peer, error) {
690
+func (dht *IpfsDHT) peerFromInfo(pbp *Message_PBPeer) (*peer.Peer, error) {
691
maddr, err := ma.NewMultiaddr(pbp.GetAddr())
692
if err != nil {
693
return nil, err