Move all Fluffy database code to database folder (#1918)

status-im · Dec 1, 2023 · aad4add · aad4add
1 parent 5e9e6ee
commit aad4add
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 30 deletions.
diff --git a/fluffy/content_db.nim → fluffy/database/content_db.nim b/fluffy/content_db.nim → fluffy/database/content_db.nim
@@ -14,8 +14,8 @@ import
   stew/results,
   eth/db/kvstore,
   eth/db/kvstore_sqlite3,
-  ./network/state/state_content,
-  "."/network/wire/[portal_protocol, portal_protocol_config],
+  ../network/state/state_content,
+  ../network/wire/[portal_protocol, portal_protocol_config],
   ./content_db_custom_sql_functions
 
 export kvstore_sqlite3

diff --git a/fluffy/content_db_custom_sql_functions.nim → ...abase/content_db_custom_sql_functions.nim b/fluffy/content_db_custom_sql_functions.nim → ...abase/content_db_custom_sql_functions.nim
diff --git a/fluffy/seed_db.nim → fluffy/database/seed_db.nim b/fluffy/seed_db.nim → fluffy/database/seed_db.nim
@@ -1,4 +1,4 @@
-# Nimbus
+# Fluffy
 # Copyright (c) 2022-2023 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).

diff --git a/fluffy/fluffy.nim b/fluffy/fluffy.nim
@@ -1,4 +1,4 @@
-# Nimbus
+# Fluffy
 # Copyright (c) 2021-2023 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
@@ -29,7 +29,7 @@ import
   ],
   ./network/wire/[portal_stream, portal_protocol_config],
   ./eth_data/history_data_ssz_e2s,
-  ./content_db,
+  ./database/content_db,
   ./version, ./logging
 
 chronicles.formatIt(IoErrorCode): $it

diff --git a/fluffy/network/history/history_network.nim b/fluffy/network/history/history_network.nim
@@ -1,4 +1,4 @@
-# Nimbus
+# Fluffy
 # Copyright (c) 2021-2023 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
@@ -12,7 +12,7 @@ import
   eth/[common/eth_types_rlp, rlp],
   eth/p2p/discoveryv5/[protocol, enr],
   ../../common/common_types,
-  ../../content_db,
+  ../../database/content_db,
   ../../network_metadata,
   ../../../nimbus/[constants, db/core_db],
   ../wire/[portal_protocol, portal_stream, portal_protocol_config],

diff --git a/fluffy/network/network_seed.nim b/fluffy/network/network_seed.nim
@@ -1,4 +1,4 @@
-# Nimbus
+# Fluffy
 # Copyright (c) 2022-2023 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
@@ -13,7 +13,7 @@ import
   eth/p2p/discoveryv5/[node, random2],
   ./wire/portal_protocol,
   ./history/[history_content, history_network],
-  ../seed_db
+  ../database/seed_db
 
 # Experimental module which implements different content seeding strategies.
 # Module is oblivious to content stored in seed database as all content related

diff --git a/fluffy/network/state/state_network.nim b/fluffy/network/state/state_network.nim
@@ -1,5 +1,5 @@
-# Nimbus
-# Copyright (c) 2021-2022 Status Research & Development GmbH
+# Fluffy
+# Copyright (c) 2021-2023 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -8,7 +8,7 @@
 import
   stew/results, chronos, chronicles,
   eth/p2p/discoveryv5/[protocol, enr],
-  ../../content_db,
+  ../../database/content_db,
   ../wire/[portal_protocol, portal_stream, portal_protocol_config],
   ./state_content,
   ./state_distance

diff --git a/fluffy/network/wire/portal_protocol.nim b/fluffy/network/wire/portal_protocol.nim
@@ -1,4 +1,4 @@
-# Nimbus - Portal Network
+# Fluffy
 # Copyright (c) 2021-2023 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
@@ -16,7 +16,6 @@ import
   nimcrypto/hash, bearssl, ssz_serialization, metrics, faststreams,
   eth/rlp, eth/p2p/discoveryv5/[protocol, node, enr, routing_table, random2,
     nodes_verification, lru],
-  ../../seed_db,
   "."/[portal_stream, portal_protocol_config],
   ./messages
 

diff --git a/fluffy/rpc/rpc_portal_debug_api.nim b/fluffy/rpc/rpc_portal_debug_api.nim
@@ -1,4 +1,4 @@
-# Nimbus
+# Fluffy
 # Copyright (c) 2022-2023 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
@@ -12,7 +12,7 @@ import
   ../network/wire/portal_protocol,
   ../network/network_seed,
   ../eth_data/history_data_seeding,
-  ".."/[content_db, seed_db]
+  ../database/[content_db, seed_db]
 
 export rpcserver
 

diff --git a/fluffy/scripts/test_portal_testnet.nim b/fluffy/scripts/test_portal_testnet.nim
@@ -1,4 +1,4 @@
-# Nimbus
+# Fluffy
 # Copyright (c) 2021-2023 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
@@ -19,7 +19,7 @@ import
     history_data_json_store,
     history_data_ssz_e2s],
   ../network/history/[history_content, accumulator],
-  ../seed_db,
+  ../database/seed_db,
   ../tests/test_history_util
 
 type

diff --git a/fluffy/tests/test_content_db.nim b/fluffy/tests/test_content_db.nim
@@ -11,7 +11,7 @@ import
   unittest2, stint,
   eth/keys,
   ../network/state/state_content,
-  ../content_db,
+  ../database/content_db,
   ./test_helpers
 
 suite "Content Database":

diff --git a/fluffy/tests/test_history_network.nim b/fluffy/tests/test_history_network.nim
@@ -1,4 +1,4 @@
-# Nimbus - Portal Network
+# Fluffy
 # Copyright (c) 2022-2023 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
@@ -14,7 +14,7 @@ import
   ../network/wire/[portal_protocol, portal_stream, portal_protocol_config],
   ../network/history/[history_network, accumulator, history_content],
   ../../nimbus/constants,
-  ../content_db,
+  ../database/content_db,
   ./test_helpers
 
 type HistoryNode = ref object

diff --git a/fluffy/tests/test_portal_wire_protocol.nim b/fluffy/tests/test_portal_wire_protocol.nim
@@ -1,4 +1,4 @@
-# Nimbus - Portal Network
+# Fluffy
 # Copyright (c) 2021-2023 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
@@ -14,7 +14,7 @@ import
   eth/keys, eth/p2p/discoveryv5/routing_table, nimcrypto/[hash, sha2],
   eth/p2p/discoveryv5/protocol as discv5_protocol,
   ../network/wire/[portal_protocol, portal_stream, portal_protocol_config],
-  ../content_db,
+  ../database/content_db,
   ./test_helpers
 
 const protocolId = [byte 0x50, 0x00]

diff --git a/fluffy/tests/test_state_network.nim b/fluffy/tests/test_state_network.nim
@@ -1,5 +1,5 @@
-# Nimbus - Portal Network
-# Copyright (c) 2021 Status Research & Development GmbH
+# Fluffy
+# Copyright (c) 2021-2023 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -14,7 +14,7 @@ import
   ../../nimbus/common/[chain_config, genesis],
   ../network/wire/[portal_protocol, portal_stream],
   ../network/state/[state_content, state_network],
-  ../content_db,
+  ../database/content_db,
   ./test_helpers
 
 proc genesisToTrie(filePath: string): CoreDbMptRef =

diff --git a/fluffy/tools/eth_data_exporter.nim b/fluffy/tools/eth_data_exporter.nim
@@ -1,4 +1,4 @@
-# Nimbus
+# Fluffy
 # Copyright (c) 2022-2023 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
@@ -46,7 +46,7 @@ import
   eth/common/eth_types_json_serialization,
   json_rpc/rpcclient,
   ncli/e2store,
-  ../seed_db,
+  ../database/seed_db,
   ../../premix/[downloader, parser],
   ../network/history/[history_content, accumulator],
   ../eth_data/[history_data_json_store, history_data_ssz_e2s],

diff --git a/fluffy/tools/portalcli.nim b/fluffy/tools/portalcli.nim
@@ -1,4 +1,4 @@
-# Nimbus - Portal Network
+# Fluffy
 # Copyright (c) 2021-2023 Status Research & Development GmbH
 # Licensed and distributed under either of
 #   * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
@@ -14,7 +14,7 @@ import
   eth/p2p/discoveryv5/[enr, node],
   eth/p2p/discoveryv5/protocol as discv5_protocol,
   ../common/common_utils,
-  ../content_db,
+  ../database/content_db,
   ../network/wire/[portal_protocol, portal_stream, portal_protocol_config],
   ../network/history/[history_content, history_network]