Renames on Portal beacon LC code (#1496)

fluffy/fluffy.nim

@@ -24,11 +24,8 @@ import
   ./network/state/[state_network, state_content],
   ./network/history/[history_network, history_content],
   ./network/beacon_light_client/[
-    light_client_init_loader,
+    beacon_light_client_init_loader,
-    light_client_content,
     beacon_light_client,
-    light_client_db,
-    light_client_network
   ],
   ./network/wire/[portal_stream, portal_protocol_config],
   ./eth_data/history_data_ssz_e2s,
@@ -49,7 +46,7 @@ proc initializeBridgeClient(maybeUri: Option[string]): Option[BridgeClient] =
     notice "Failed to initialize bridge client", error = err.msg
     return none(BridgeClient)
 
-proc run(config: PortalConf) {.raises: [CatchableError, Defect].} =
+proc run(config: PortalConf) {.raises: [CatchableError].} =
   # Make sure dataDir exists
   let pathExists = createPath(config.dataDir.string)
   if pathExists.isErr():

fluffy/network/beacon_light_client/beacon_light_client.nim

@@ -13,11 +13,13 @@ import
   beacon_chain/gossip_processing/light_client_processor,
   beacon_chain/spec/datatypes/altair,
   beacon_chain/beacon_clock,
-  "."/[light_client_network, beacon_light_client_manager]
+  "."/[beacon_light_client_network, beacon_light_client_manager]
 
-export LightClientFinalizationMode
+export
+  LightClientFinalizationMode,
+  beacon_light_client_network, beacon_light_client_manager
 
-logScope: topics = "lightcl"
+logScope: topics = "portal_beacon_lc"
 
 type
   LightClientHeaderCallback* =

fluffy/network/beacon_light_client/beacon_light_client_db.nim

@@ -16,7 +16,7 @@ import
   stint,
   stew/[results, byteutils],
   ssz_serialization,
-  ./light_client_content,
+  ./beacon_light_client_content,
   ../wire/portal_protocol
 
 export kvstore_sqlite3

fluffy/network/beacon_light_client/beacon_light_client_manager.nim

@@ -14,12 +14,12 @@ import
   beacon_chain/spec/datatypes/[phase0, altair, bellatrix, capella, deneb],
   beacon_chain/spec/[forks_light_client, digest],
   beacon_chain/beacon_clock,
-  "."/[light_client_network, light_client_content]
+  "."/[beacon_light_client_network, beacon_light_client_content]
 
 from beacon_chain/consensus_object_pools/block_pools_types import VerifierError
 
 logScope:
-  topics = "lcman"
+  topics = "beacon_lc_man"
 
 type
   Nothing = object

fluffy/network/beacon_light_client/beacon_light_client_network.nim

@@ -15,10 +15,12 @@ import
   beacon_chain/spec/datatypes/[phase0, altair, bellatrix],
   ../../../nimbus/constants,
   ../wire/[portal_protocol, portal_stream, portal_protocol_config],
-  "."/[light_client_content, light_client_db]
+  "."/[beacon_light_client_content, beacon_light_client_db]
+
+export beacon_light_client_content, beacon_light_client_db
 
 logScope:
-  topics = "portal_lc"
+  topics = "portal_beacon_lc"
 
 const
   lightClientProtocolId* = [byte 0x50, 0x1A]

fluffy/tests/beacon_light_client_tests/all_beacon_light_client_tests.nim

@@ -1,5 +1,5 @@
 # Nimbus
-# Copyright (c) 2022 Status Research & Development GmbH
+# Copyright (c) 2022-2023 Status Research & Development GmbH
 # Licensed under either of
 #  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
 #  * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
@@ -8,6 +8,6 @@
 {. warning[UnusedImport]:off .}
 
 import
-  ./test_light_client_content,
+  ./test_beacon_light_client_content,
-  ./test_light_client_network,
+  ./test_beacon_light_client_network,
   ./test_beacon_light_client

fluffy/tests/beacon_light_client_tests/beacon_light_client_test_helpers.nim

@@ -11,8 +11,7 @@ import
   beacon_chain/spec/forks,
   ../../network/wire/[portal_protocol, portal_stream],
   ../../network/beacon_light_client/[
-    light_client_network,
+    beacon_light_client_network
-    light_client_db
   ],
   ../test_helpers
 

fluffy/tests/beacon_light_client_tests/test_beacon_light_client.nim

@@ -16,8 +16,8 @@ import
   beacon_chain/beacon_clock,
   beacon_chain/conf,
   ../../network/wire/[portal_protocol, portal_stream],
-  ../../network/beacon_light_client/[light_client_content, beacon_light_client],
+  ../../network/beacon_light_client/beacon_light_client,
-  "."/[light_client_test_data, light_client_test_helpers]
+  "."/[light_client_test_data, beacon_light_client_test_helpers]
 
 procSuite "Portal Beacon Light Client":
   let rng = newRng()

fluffy/tests/beacon_light_client_tests/test_beacon_light_client_content.nim

@@ -11,8 +11,8 @@ import
   unittest2,
   beacon_chain/spec/forks,
   beacon_chain/spec/datatypes/altair,
-  ../../network/beacon_light_client/light_client_content,
+  ../../network/beacon_light_client/beacon_light_client_content,
-  "."/[light_client_test_data, light_client_test_helpers]
+  "."/[light_client_test_data, beacon_light_client_test_helpers]
 
 suite "Beacon Light Client Content Encodings":
   let forkDigests = testForkDigests

fluffy/tests/beacon_light_client_tests/test_beacon_light_client_network.nim

@@ -11,8 +11,8 @@ import
   beacon_chain/spec/forks,
   beacon_chain/spec/datatypes/altair,
   ../../network/wire/portal_protocol,
-  ../../network/beacon_light_client/[light_client_network, light_client_content],
+  ../../network/beacon_light_client/beacon_light_client_network,
-  "."/[light_client_test_data, light_client_test_helpers]
+  "."/[light_client_test_data, beacon_light_client_test_helpers]
 
 procSuite "Beacon Light Client Content Network":
   let rng = newRng()