Clean up old unused code and unused imports (#877)

status-im · Oct 22, 2021 · 02e8b2e · 02e8b2e
1 parent 92dfb02
commit 02e8b2e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 237 deletions.
diff --git a/fluffy/network/history/history_network.nim b/fluffy/network/history/history_network.nim
@@ -7,7 +7,7 @@
 
 import
  std/[options, sugar],
- stew/[results, byteutils],
+ stew/results,
  eth/p2p/discoveryv5/[protocol, node, enr],
  ../../content_db,
  ../wire/portal_protocol,

diff --git a/fluffy/network/history/messages.nim b/fluffy/network/history/messages.nim
diff --git a/fluffy/network/state/state_content.nim b/fluffy/network/state/state_content.nim
@@ -10,9 +10,9 @@
 {.push raises: [Defect].}
 
 import
- std/[options, sugar],
+ std/options,
  nimcrypto/[sha2, hash], stew/objects, stint,
- eth/ssz/ssz_serialization, eth/trie/[hexary, db],
+ eth/ssz/ssz_serialization,
  ../../common/common_types
 
 export ssz_serialization, common_types
@@ -80,28 +80,3 @@ func toContentId*(contentKey: ByteList): ContentId =
 
 func toContentId*(contentKey: ContentKey): ContentId =
  toContentId(encode(contentKey))
-
-type
- ContentStorage* = object
- # TODO: Quick implementation for now where we just use HexaryTrie, current
- # idea is to move in here a more direct storage of the trie nodes, but have
- # an `ContentProvider` "interface" that could provide the trie nodes via
- # this direct storage, via the HexaryTrie (for full nodes), or also without
- # storage, via json rpc client requesting data from a full eth1 client.
- trie*: HexaryTrie
-
-proc get*(storage: ContentStorage, key: ContentKey): Option[seq[byte]] =
- if storage.trie.db == nil: # TODO: for now...
- return none(seq[byte])
- let val = storage.trie.db.get(key.nodeHash.data)
- if val.len > 0:
- some(val)
- else:
- none(seq[byte])
-
-proc get*(storage: ContentStorage, contentKey: ByteList): Option[seq[byte]] =
- decode(contentKey).flatMap((key: ContentKey) => get(storage, key))
-
-proc newEmptyInMemoryStorage*(): ContentStorage =
- let trie = initHexaryTrie(newMemoryDb())
- ContentStorage(trie: trie)
diff --git a/fluffy/network/state/state_network.nim b/fluffy/network/state/state_network.nim
@@ -7,7 +7,7 @@
 
 import
  std/[options, sugar],
- stew/[results, byteutils],
+ stew/results,
  eth/p2p/discoveryv5/[protocol, node, enr],
  ../../content_db,
  ../wire/portal_protocol,

diff --git a/fluffy/tests/test_portal_wire_protocol.nim b/fluffy/tests/test_portal_wire_protocol.nim
@@ -8,7 +8,7 @@
 {.used.}
 
 import
- chronos, testutils/unittests, stew/shims/net, stew/byteutils,
+ chronos, testutils/unittests, stew/shims/net,
  eth/keys, eth/p2p/discoveryv5/routing_table, nimcrypto/[hash, sha2],
  eth/p2p/discoveryv5/protocol as discv5_protocol,
  ../network/wire/portal_protocol,