Portal beacon: Remove unneeded and confusing (fork specific) imports (#2776)

fluffy/network/beacon/beacon_chain_historical_roots.nim

@@ -20,7 +20,7 @@
 
 {.push raises: [].}
 
-import results, beacon_chain/spec/forks, beacon_chain/spec/datatypes/bellatrix
+import results, beacon_chain/spec/forks
 
 export results
 

fluffy/network/beacon/beacon_chain_historical_summaries.nim

@@ -15,12 +15,7 @@
 
 {.push raises: [].}
 
-import
+import stew/arrayops, results, beacon_chain/spec/forks, ../../common/common_types
-  stew/arrayops,
-  results,
-  beacon_chain/spec/forks,
-  beacon_chain/spec/datatypes/capella,
-  ../../common/common_types
 
 export results
 

fluffy/network/beacon/beacon_db.nim

@@ -16,7 +16,6 @@ import
   results,
   ssz_serialization,
   beacon_chain/db_limits,
-  beacon_chain/spec/datatypes/[phase0, altair, bellatrix],
   beacon_chain/spec/forks,
   beacon_chain/spec/forks_light_client,
   ./beacon_content,

fluffy/network/beacon/beacon_init_loader.nim

@@ -11,7 +11,6 @@ import
   chronicles,
   beacon_chain/networking/network_metadata,
   beacon_chain/spec/forks,
-  beacon_chain/spec/datatypes/altair,
   beacon_chain/beacon_clock,
   beacon_chain/conf
 

fluffy/network/beacon/beacon_light_client.nim

@@ -11,7 +11,6 @@ import
   chronicles,
   eth/p2p/discoveryv5/random2,
   beacon_chain/gossip_processing/light_client_processor,
-  beacon_chain/spec/datatypes/altair,
   beacon_chain/beacon_clock,
   "."/[beacon_init_loader, beacon_network, beacon_light_client_manager]
 

fluffy/network/beacon/beacon_light_client_manager.nim

@@ -14,8 +14,7 @@ import
   stew/base10,
   results,
   eth/p2p/discoveryv5/random2,
-  beacon_chain/spec/datatypes/[phase0, altair, bellatrix, capella, deneb, electra],
+  beacon_chain/spec/[forks, forks_light_client, digest],
-  beacon_chain/spec/[forks_light_client, digest],
   beacon_chain/beacon_clock,
   beacon_chain/sync/light_client_sync_helpers,
   "."/[beacon_network, beacon_content, beacon_db]

fluffy/tests/beacon_network_tests/test_beacon_content.nim

@@ -14,7 +14,6 @@ import
   results,
   beacon_chain/networking/network_metadata,
   beacon_chain/spec/forks,
-  beacon_chain/spec/datatypes/altair,
   ../../network/beacon/beacon_content,
   ../../eth_data/yaml_utils,
   "."/light_client_test_data

fluffy/tests/beacon_network_tests/test_beacon_historical_roots.nim

@@ -12,7 +12,6 @@
 import
   unittest2,
   beacon_chain/spec/forks,
-  beacon_chain/spec/datatypes/bellatrix,
   # Test helpers
   beacon_chain /../ tests/testblockutil,
   beacon_chain /../ tests/mocking/mock_genesis,

fluffy/tests/beacon_network_tests/test_beacon_historical_summaries.nim

@@ -12,7 +12,6 @@
 import
   unittest2,
   beacon_chain/spec/forks,
-  beacon_chain/spec/datatypes/capella,
   # Test helpers
   beacon_chain /../ tests/testblockutil,
   beacon_chain /../ tests/mocking/mock_genesis,

fluffy/tests/beacon_network_tests/test_beacon_light_client.nim

@@ -12,7 +12,6 @@ import
   chronos,
   eth/p2p/discoveryv5/protocol as discv5_protocol,
   beacon_chain/spec/forks,
-  beacon_chain/spec/datatypes/altair,
   beacon_chain/spec/helpers,
   ../../network/wire/[portal_protocol, portal_stream],
   ../../network/beacon/[beacon_init_loader, beacon_light_client],

fluffy/tests/beacon_network_tests/test_beacon_network.nim

@@ -10,7 +10,6 @@ import
   chronos,
   eth/p2p/discoveryv5/protocol as discv5_protocol,
   beacon_chain/spec/forks,
-  beacon_chain/spec/datatypes/altair,
   # Test helpers
   beacon_chain /../ tests/testblockutil,
   beacon_chain /../ tests/mocking/mock_genesis,