diff options
author | Felix Lange <fjl@twurst.com> | 2019-02-19 20:29:41 +0800 |
---|---|---|
committer | Felix Lange <fjl@twurst.com> | 2019-02-19 20:29:41 +0800 |
commit | 57f959af41bd94887aafea87af6a1f80b8182cf5 (patch) | |
tree | c4c0769538a648ee180a55ed25c554840c7cc68c | |
parent | cf147c71d5d441198a9d326969ffcf7fb1333abd (diff) | |
download | go-tangerine-57f959af41bd94887aafea87af6a1f80b8182cf5.tar go-tangerine-57f959af41bd94887aafea87af6a1f80b8182cf5.tar.gz go-tangerine-57f959af41bd94887aafea87af6a1f80b8182cf5.tar.bz2 go-tangerine-57f959af41bd94887aafea87af6a1f80b8182cf5.tar.lz go-tangerine-57f959af41bd94887aafea87af6a1f80b8182cf5.tar.xz go-tangerine-57f959af41bd94887aafea87af6a1f80b8182cf5.tar.zst go-tangerine-57f959af41bd94887aafea87af6a1f80b8182cf5.zip |
p2p/enode: use localItemKey for local sequence number
I added localItemKey for this purpose in #18963, but then
forgot to actually use it. This changes the database layout
yet again and requires bumping the version number.
-rw-r--r-- | p2p/enode/nodedb.go | 6 | ||||
-rw-r--r-- | p2p/enode/nodedb_test.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/p2p/enode/nodedb.go b/p2p/enode/nodedb.go index 9353b155c..a43e63868 100644 --- a/p2p/enode/nodedb.go +++ b/p2p/enode/nodedb.go @@ -57,7 +57,7 @@ const ( const ( dbNodeExpiration = 24 * time.Hour // Time after which an unseen node should be dropped. dbCleanupCycle = time.Hour // Time period for running the expiration task. - dbVersion = 8 + dbVersion = 9 ) var zeroIP = make(net.IP, 16) @@ -380,12 +380,12 @@ func (db *DB) UpdateFindFails(id ID, ip net.IP, fails int) error { // LocalSeq retrieves the local record sequence counter. func (db *DB) localSeq(id ID) uint64 { - return db.fetchUint64(nodeItemKey(id, zeroIP, dbLocalSeq)) + return db.fetchUint64(localItemKey(id, dbLocalSeq)) } // storeLocalSeq stores the local record sequence counter. func (db *DB) storeLocalSeq(id ID, n uint64) { - db.storeUint64(nodeItemKey(id, zeroIP, dbLocalSeq), n) + db.storeUint64(localItemKey(id, dbLocalSeq), n) } // QuerySeeds retrieves random nodes to be used as potential seed nodes diff --git a/p2p/enode/nodedb_test.go b/p2p/enode/nodedb_test.go index 341b61a28..21283524c 100644 --- a/p2p/enode/nodedb_test.go +++ b/p2p/enode/nodedb_test.go @@ -71,7 +71,7 @@ func TestDBNodeItemKey(t *testing.T) { if id != keytestID { t.Errorf("splitNodeItemKey returned wrong ID: %v", id) } - if !bytes.Equal(ip, wantIP) { + if !ip.Equal(wantIP) { t.Errorf("splitNodeItemKey returned wrong IP: %v", ip) } if field != wantField { |