1 files changed, 32 insertions, 10 deletions

diff --git a/src/gnunet/service/dht/routingtable_test.go b/src/gnunet/service/dht/routingtable_test.go
index 33c4b7f..16f39de 100644
--- a/src/gnunet/service/dht/routingtable_test.go
+++ b/src/gnunet/service/dht/routingtable_test.go
@@ -19,8 +19,11 @@
 package dht
 
 import (
+        "crypto/sha512"
+        "encoding/hex"
         "gnunet/config"
         "gnunet/core"
+        "gnunet/service/dht/blocks"
         "gnunet/util"
         "math/rand"
         "testing"
@@ -43,7 +46,7 @@ type Entry struct {
 
 // test data
 var (
-        cfg = &config.NodeConfig{
+        nodeCfg = &config.NodeConfig{
                 PrivateSeed: "YGoe6XFH3XdvFRl+agx9gIzPTvxA229WFdkazEMdcOs=",
                 Endpoints: []*config.EndpointConfig{
                         {
@@ -53,6 +56,9 @@ var (
                         },
                 },
         }
+        rtCfg = &config.RoutingConfig{
+                PeerTTL: 10800,
+        }
 )
 
 // TestRT connects and disconnects random peers to test the base
@@ -64,18 +70,16 @@ func TestRT(t *testing.T) {
         // helper functions
         genRemotePeer := func() *PeerAddress {
                 d := make([]byte, 32)
-                if _, err := rand.Read(d); err != nil {
-                        panic(err)
-                }
+                _, _ = rand.Read(d)
                 return NewPeerAddress(util.NewPeerID(d))
         }
 
         // create routing table and start command handler
-        local, err := core.NewLocalPeer(cfg)
+        local, err := core.NewLocalPeer(nodeCfg)
         if err != nil {
                 t.Fatal(err)
         }
-        rt := NewRoutingTable(NewPeerAddress(local.GetID()))
+        rt := NewRoutingTable(NewPeerAddress(local.GetID()), rtCfg)
 
         // create a task list
         tasks := make([]*Entry, NUMP)
@@ -91,7 +95,6 @@ func TestRT(t *testing.T) {
 
         // actions:
         connected := func(task *Entry, e int64, msg string) {
-                task.addr.connected = true
                 rt.Add(task.addr)
                 task.online = true
                 task.last = e
@@ -136,10 +139,29 @@ func TestRT(t *testing.T) {
 
         // execute some routing functions on remaining table
         k := genRemotePeer()
-        bf := NewPeerBloomFilter()
-        n := rt.SelectClosestPeer(k, bf)
+        pf := blocks.NewPeerFilter()
+        n := rt.SelectClosestPeer(k, pf)
         t.Logf("Closest: %s -> %s\n", k, n)
 
-        n = rt.SelectRandomPeer(bf)
+        n = rt.SelectRandomPeer(pf)
         t.Logf("Random: %s\n", n)
 }
+
+func TestDistance(t *testing.T) {
+        pid1 := "4ER9C0GV4QC25GGQMXBBGXYFEB3ZVAYMXZVSRKDVEGCDTAS34E30"
+        pid2 := "V61ESQ96AFXZWDSA509HP11K5HJXXJ9ECM4NAMCQRX5YW4KN8XPG"
+
+        p1, _ := util.DecodeStringToBinary(pid1, 32)
+        p2, _ := util.DecodeStringToBinary(pid2, 32)
+
+        h1 := sha512.Sum512(p1)
+        h2 := sha512.Sum512(p2)
+        t.Logf("h1=%s\n", hex.EncodeToString(h1[:]))
+        t.Logf("h2=%s\n", hex.EncodeToString(h2[:]))
+
+        pa1 := NewPeerAddress(util.NewPeerID(p1))
+        pa2 := NewPeerAddress(util.NewPeerID(p2))
+
+        dist, idx := pa1.Distance(pa2)
+        t.Logf("dist=%v, idx=%d\n", dist, idx)
+}