From e33008c1c143ce1b194bce0f72edb289c886c40d Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Fri, 13 Mar 2020 14:37:58 +0100 Subject: [PATCH] p2p/enode: remove key storage --- p2p/enode/nodedb.go | 18 ------------------ p2p/enode/nodedb_test.go | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/p2p/enode/nodedb.go b/p2p/enode/nodedb.go index c18a9742e3..bd066ce857 100644 --- a/p2p/enode/nodedb.go +++ b/p2p/enode/nodedb.go @@ -49,7 +49,6 @@ const ( dbNodePing = "lastping" dbNodePong = "lastpong" dbNodeSeq = "seq" - dbNodeKeys = "keys" // Local information is keyed by ID only, the full key is "local::seq". // Use localItemKey to create those keys. @@ -400,23 +399,6 @@ func (db *DB) UpdateFindFailsV5(id ID, ip net.IP, fails int) error { return db.storeInt64(v5Key(id, ip, dbNodeFindFails), int64(fails)) } -// KeysV5 retrieves discv5 AES keys. -func (db *DB) KeysV5(id ID, ip net.IP) ([]byte, []byte) { - k, _ := db.lvl.Get(v5Key(id, ip, dbNodeKeys), nil) - if len(k) == 0 { - return nil, nil - } - return k[:16], k[16:32] -} - -// StoreKeysV5 stores discv5 AES keys. -func (db *DB) StoreKeysV5(id ID, ip net.IP, w, r []byte) error { - k := make([]byte, len(w)+len(r)) - copy(k, w) - copy(k[len(w):], r) - return db.lvl.Put(v5Key(id, ip, dbNodeKeys), k, nil) -} - // LocalSeq retrieves the local record sequence counter. func (db *DB) localSeq(id ID) uint64 { return db.fetchUint64(localItemKey(id, dbLocalSeq)) diff --git a/p2p/enode/nodedb_test.go b/p2p/enode/nodedb_test.go index c9add47f83..80a7755ff0 100644 --- a/p2p/enode/nodedb_test.go +++ b/p2p/enode/nodedb_test.go @@ -471,7 +471,7 @@ func TestDBExpireV5(t *testing.T) { ip := net.IP{127, 0, 0, 1} key := make([]byte, 16) - db.StoreKeysV5(ID{}, ip, key, key) + db.StoreFindFailsV5(ID{}, ip, key, key) db.expireNodes() }