forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 09:23:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

p2p/enr: binary search on Set

Browse source
This commit is contained in:
Anton Evangelatov 2017-12-06 15:01:28 +01:00 committed by Felix Lange
parent 0206b31c6a
commit 617f9e64f8
2 changed files with 59 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
p2p/enr/enr.go
View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU Lesser General Public License
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
// Package discover implements the Ethereum Node Record as per https://github.com/ethereum/EIPs/pull/778
// Package enr implements the Ethereum Node Record as per https://github.com/ethereum/EIPs/pull/778
package enr
import (
@ -104,12 +104,14 @@ func (r *Record) Set(k Key) {
if err != nil {
panic(fmt.Errorf("enr: can't encode %s: %v", k.ENRKey(), err))
}
for i, p := range r.pairs {
if p.k == k.ENRKey() {
// replace value of pair
i := sort.Search(len(r.pairs), func(i int) bool { return r.pairs[i].k >= k.ENRKey() })
if i < len(r.pairs) && r.pairs[i].k == k.ENRKey() {
// element is present at r.pairs[i]
r.pairs[i].v = blob
return
} else if p.k > k.ENRKey() {
} else if i < len(r.pairs) {
// insert pair before i-th elem
el := pair{k.ENRKey(), blob}
r.pairs = append(r.pairs, pair{})
@ -117,7 +119,8 @@ func (r *Record) Set(k Key) {
r.pairs[i] = el
return
}
}
// element should be placed at the end of r.pairs
r.pairs = append(r.pairs, pair{k.ENRKey(), blob})
}

42
p2p/enr/enr_test.go
View file

@ -76,6 +76,48 @@ func TestGetSetIP4(t *testing.T) {
}
}
// TestSortedGetAndSet tests that Set produced a sorted pairs slice.
func TestSortedGetAndSet(t *testing.T) {
type pair struct {
k string
v uint32
}
for _, tt := range []struct {
input []pair
want []pair
}{
{
input: []pair{{"a", 1}, {"c", 2}, {"b", 3}},
want: []pair{{"a", 1}, {"b", 3}, {"c", 2}},
},
{
input: []pair{{"a", 1}, {"c", 2}, {"b", 3}, {"d", 4}, {"a", 5}, {"bb", 6}},
want: []pair{{"a", 5}, {"b", 3}, {"bb", 6}, {"c", 2}, {"d", 4}},
},
{
input: []pair{{"c", 2}, {"b", 3}, {"d", 4}, {"a", 5}, {"bb", 6}},
want: []pair{{"a", 5}, {"b", 3}, {"bb", 6}, {"c", 2}, {"d", 4}},
},
} {
var r Record
for _, i := range tt.input {
r.Set(WithKey(i.k, &i.v))
}
for i, w := range tt.want {
// set got's key from r.pair[i], so that we preserve order of pairs
got := pair{k: r.pairs[i].k}
if ok, err := r.Load(WithKey(w.k, &got.v)); !ok || err != nil {
t.Fatal(err)
}
if got != w {
t.Fatalf("expected %#v, got %#v", w, got)
}
}
}
}
// TestGetSetIP6 tests encoding/decoding and setting/getting of the enr.IP6 type
func TestGetSetIP6(t *testing.T) {
ip := IP6(net.IP{0x20, 0x01, 0x48, 0x60, 0, 0, 0x20, 0x01, 0, 0, 0, 0, 0, 0, 0x00, 0x68})