Peernet-Archive/core
1
0
Fork 0
mirror of https://github.com/PeernetOfficial/core.git synced 2026-07-17 02:47:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Provide old and new peer in ShouldEvict. New comparison function IsNodeCloser.

Browse Source 
Remove unused code (which was likely buggy anyway).
This commit is contained in:
Kleissner
2021-04-22 05:45:46 +02:00
parent 4b905f4eab
commit 27152cb145
3 changed files with 13 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dht/Hash Table.go
View File

@@ -9,7 +9,6 @@ package dht
import (
"bytes"
"math"
"math/big"
"math/rand"
"sort"
"sync"
@@ -137,7 +136,7 @@ func (ht *hashTable) getClosestContacts(num int, target []byte, filterFunc NodeF
return sl
}
func (ht *hashTable) insertNode(node *Node, shouldEvict func(*Node) bool) {
func (ht *hashTable) insertNode(node *Node, shouldEvict func(nodeOld *Node, nodeNew *Node) bool) {
index := ht.getBucketIndexFromDifferingBit(node.ID)
// If the node already exist, mark it as seen
@@ -154,7 +153,7 @@ func (ht *hashTable) insertNode(node *Node, shouldEvict func(*Node) bool) {
bucket := ht.RoutingTable[index]
if len(bucket) == ht.bSize {
if shouldEvict(bucket[0]) {
if shouldEvict(bucket[0], node) {
bucket = append(bucket, node)
bucket = bucket[1:]
}
@@ -181,37 +180,12 @@ func (ht *hashTable) removeNode(ID []byte) {
ht.RoutingTable[index] = bucket
}
func (ht *hashTable) getAllNodesInBucketCloserThan(bucket int, id []byte) [][]byte {
b := ht.RoutingTable[bucket]
var nodes [][]byte
for _, v := range b {
d1 := ht.getDistance(id, ht.Self.ID)
d2 := ht.getDistance(id, v.ID)
result := d1.Sub(d1, d2)
if result.Sign() > -1 {
nodes = append(nodes, v.ID)
}
}
return nodes
}
func (ht *hashTable) getTotalNodesInBucket(bucket int) int {
ht.mutex.Lock()
defer ht.mutex.Unlock()
return len(ht.RoutingTable[bucket])
}
func (ht *hashTable) getDistance(id1 []byte, id2 []byte) *big.Int {
dst := make([]byte, ht.bSize)
for i := 0; i < ht.bSize; i++ {
dst[i] = id1[i] ^ id2[i]
}
ret := big.NewInt(0)
return ret.SetBytes(dst[:])
}
func (ht *hashTable) getRandomIDFromBucket(bucket int) []byte {
ht.mutex.Lock()
defer ht.mutex.Unlock()