From 76fb97e26f8a29008e6da5cee051b4f4bbea6ced Mon Sep 17 00:00:00 2001 From: Timothy Wu Date: Mon, 24 Feb 2025 15:37:14 -0500 Subject: [PATCH] revise network-types --- internal/client/network-gossip/bridge.go | 2 +- internal/client/network-gossip/bridge_test.go | 4 ++-- internal/client/network-gossip/network_gossip.go | 2 +- internal/client/network-gossip/state_machine.go | 2 +- internal/client/network-gossip/state_machine_test.go | 4 ++-- internal/client/network-gossip/validator.go | 2 +- internal/client/network/config/config.go | 4 ++-- internal/client/network/event/event.go | 4 ++-- internal/client/network/service/service.go | 4 ++-- internal/client/network/sync/sync.go | 2 +- internal/client/{network-types => network/types}/kad/kad.go | 2 +- .../{network-types => network/types}/multiaddr/multiaddr.go | 0 .../{network-types => network/types}/multihash/multihash.go | 0 .../{network-types => network/types}/peer-id/peer_id.go | 2 +- .../{network-types => network/types}/peer-id/peer_id_test.go | 0 15 files changed, 17 insertions(+), 17 deletions(-) rename internal/client/{network-types => network/types}/kad/kad.go (91%) rename internal/client/{network-types => network/types}/multiaddr/multiaddr.go (100%) rename internal/client/{network-types => network/types}/multihash/multihash.go (100%) rename internal/client/{network-types => network/types}/peer-id/peer_id.go (96%) rename internal/client/{network-types => network/types}/peer-id/peer_id_test.go (100%) diff --git a/internal/client/network-gossip/bridge.go b/internal/client/network-gossip/bridge.go index 00843ac3f6..7c951d4d1c 100644 --- a/internal/client/network-gossip/bridge.go +++ b/internal/client/network-gossip/bridge.go @@ -6,9 +6,9 @@ import ( "time" "github.com/ChainSafe/gossamer/internal/client/network" - peerid "github.com/ChainSafe/gossamer/internal/client/network-types/peer-id" "github.com/ChainSafe/gossamer/internal/client/network/service" netSync "github.com/ChainSafe/gossamer/internal/client/network/sync" + peerid "github.com/ChainSafe/gossamer/internal/client/network/types/peer-id" "github.com/ChainSafe/gossamer/internal/log" "github.com/ChainSafe/gossamer/internal/primitives/runtime" ) diff --git a/internal/client/network-gossip/bridge_test.go b/internal/client/network-gossip/bridge_test.go index 727ff01f23..86e68e1451 100644 --- a/internal/client/network-gossip/bridge_test.go +++ b/internal/client/network-gossip/bridge_test.go @@ -9,13 +9,13 @@ import ( "time" "github.com/ChainSafe/gossamer/internal/client/network" - "github.com/ChainSafe/gossamer/internal/client/network-types/multiaddr" - peerid "github.com/ChainSafe/gossamer/internal/client/network-types/peer-id" "github.com/ChainSafe/gossamer/internal/client/network/config" "github.com/ChainSafe/gossamer/internal/client/network/event" "github.com/ChainSafe/gossamer/internal/client/network/role" "github.com/ChainSafe/gossamer/internal/client/network/service" netSync "github.com/ChainSafe/gossamer/internal/client/network/sync" + "github.com/ChainSafe/gossamer/internal/client/network/types/multiaddr" + peerid "github.com/ChainSafe/gossamer/internal/client/network/types/peer-id" "github.com/ChainSafe/gossamer/internal/primitives/core/hash" "github.com/ChainSafe/gossamer/internal/primitives/runtime" "github.com/ChainSafe/gossamer/pkg/scale" diff --git a/internal/client/network-gossip/network_gossip.go b/internal/client/network-gossip/network_gossip.go index 4f92067f53..ea0c48134c 100644 --- a/internal/client/network-gossip/network_gossip.go +++ b/internal/client/network-gossip/network_gossip.go @@ -2,9 +2,9 @@ package gossip import ( "github.com/ChainSafe/gossamer/internal/client/network" - peerid "github.com/ChainSafe/gossamer/internal/client/network-types/peer-id" "github.com/ChainSafe/gossamer/internal/client/network/service" "github.com/ChainSafe/gossamer/internal/client/network/sync" + peerid "github.com/ChainSafe/gossamer/internal/client/network/types/peer-id" ) // Abstraction over a network. diff --git a/internal/client/network-gossip/state_machine.go b/internal/client/network-gossip/state_machine.go index 13a11ef93e..092c596e4f 100644 --- a/internal/client/network-gossip/state_machine.go +++ b/internal/client/network-gossip/state_machine.go @@ -4,9 +4,9 @@ import ( "time" "github.com/ChainSafe/gossamer/internal/client/network" - peerid "github.com/ChainSafe/gossamer/internal/client/network-types/peer-id" "github.com/ChainSafe/gossamer/internal/client/network/role" "github.com/ChainSafe/gossamer/internal/client/network/service" + peerid "github.com/ChainSafe/gossamer/internal/client/network/types/peer-id" "github.com/ChainSafe/gossamer/internal/primitives/runtime" "github.com/dolthub/maphash" "github.com/elastic/go-freelru" diff --git a/internal/client/network-gossip/state_machine_test.go b/internal/client/network-gossip/state_machine_test.go index 719ac2cc7e..d204affb07 100644 --- a/internal/client/network-gossip/state_machine_test.go +++ b/internal/client/network-gossip/state_machine_test.go @@ -5,12 +5,12 @@ import ( "testing" "github.com/ChainSafe/gossamer/internal/client/network" - "github.com/ChainSafe/gossamer/internal/client/network-types/multiaddr" - peerid "github.com/ChainSafe/gossamer/internal/client/network-types/peer-id" "github.com/ChainSafe/gossamer/internal/client/network/config" "github.com/ChainSafe/gossamer/internal/client/network/event" "github.com/ChainSafe/gossamer/internal/client/network/role" "github.com/ChainSafe/gossamer/internal/client/network/service" + "github.com/ChainSafe/gossamer/internal/client/network/types/multiaddr" + peerid "github.com/ChainSafe/gossamer/internal/client/network/types/peer-id" "github.com/ChainSafe/gossamer/internal/primitives/core/hash" "github.com/ChainSafe/gossamer/internal/primitives/runtime" "github.com/stretchr/testify/require" diff --git a/internal/client/network-gossip/validator.go b/internal/client/network-gossip/validator.go index f907a6d96f..9c4eecf670 100644 --- a/internal/client/network-gossip/validator.go +++ b/internal/client/network-gossip/validator.go @@ -1,8 +1,8 @@ package gossip import ( - peerid "github.com/ChainSafe/gossamer/internal/client/network-types/peer-id" "github.com/ChainSafe/gossamer/internal/client/network/role" + peerid "github.com/ChainSafe/gossamer/internal/client/network/types/peer-id" "golang.org/x/exp/constraints" ) diff --git a/internal/client/network/config/config.go b/internal/client/network/config/config.go index c532d4a7d1..f7d6be95bc 100644 --- a/internal/client/network/config/config.go +++ b/internal/client/network/config/config.go @@ -1,8 +1,8 @@ package config import ( - "github.com/ChainSafe/gossamer/internal/client/network-types/multiaddr" - peerid "github.com/ChainSafe/gossamer/internal/client/network-types/peer-id" + "github.com/ChainSafe/gossamer/internal/client/network/types/multiaddr" + peerid "github.com/ChainSafe/gossamer/internal/client/network/types/peer-id" ) // MultiaddrPeerId is the address of a node, including its identity. diff --git a/internal/client/network/event/event.go b/internal/client/network/event/event.go index 461b166f90..a4516f7d39 100644 --- a/internal/client/network/event/event.go +++ b/internal/client/network/event/event.go @@ -4,9 +4,9 @@ import ( "time" "github.com/ChainSafe/gossamer/internal/client/network" - "github.com/ChainSafe/gossamer/internal/client/network-types/kad" - peerid "github.com/ChainSafe/gossamer/internal/client/network-types/peer-id" "github.com/ChainSafe/gossamer/internal/client/network/role" + "github.com/ChainSafe/gossamer/internal/client/network/types/kad" + peerid "github.com/ChainSafe/gossamer/internal/client/network/types/peer-id" ) // DHTEvent is an event generated by DHT as a response to get/put value requests. diff --git a/internal/client/network/service/service.go b/internal/client/network/service/service.go index ffcd820146..6093d7dbe9 100644 --- a/internal/client/network/service/service.go +++ b/internal/client/network/service/service.go @@ -2,11 +2,11 @@ package service import ( "github.com/ChainSafe/gossamer/internal/client/network" - "github.com/ChainSafe/gossamer/internal/client/network-types/multiaddr" - peerid "github.com/ChainSafe/gossamer/internal/client/network-types/peer-id" "github.com/ChainSafe/gossamer/internal/client/network/config" "github.com/ChainSafe/gossamer/internal/client/network/event" "github.com/ChainSafe/gossamer/internal/client/network/role" + "github.com/ChainSafe/gossamer/internal/client/network/types/multiaddr" + peerid "github.com/ChainSafe/gossamer/internal/client/network/types/peer-id" ) // Provides an ability to set a fork sync request for a particular block. diff --git a/internal/client/network/sync/sync.go b/internal/client/network/sync/sync.go index 139fb2e24a..6c7ab59304 100644 --- a/internal/client/network/sync/sync.go +++ b/internal/client/network/sync/sync.go @@ -1,7 +1,7 @@ package sync import ( - peerid "github.com/ChainSafe/gossamer/internal/client/network-types/peer-id" + peerid "github.com/ChainSafe/gossamer/internal/client/network/types/peer-id" ) // SyncEvent is a syncing related event that other protocols can subscribe to. diff --git a/internal/client/network-types/kad/kad.go b/internal/client/network/types/kad/kad.go similarity index 91% rename from internal/client/network-types/kad/kad.go rename to internal/client/network/types/kad/kad.go index 842ca3bd0e..e983cfb025 100644 --- a/internal/client/network-types/kad/kad.go +++ b/internal/client/network/types/kad/kad.go @@ -3,7 +3,7 @@ package kad import ( "time" - peerid "github.com/ChainSafe/gossamer/internal/client/network-types/peer-id" + peerid "github.com/ChainSafe/gossamer/internal/client/network/types/peer-id" ) // Key is the (opaque) key of a record. diff --git a/internal/client/network-types/multiaddr/multiaddr.go b/internal/client/network/types/multiaddr/multiaddr.go similarity index 100% rename from internal/client/network-types/multiaddr/multiaddr.go rename to internal/client/network/types/multiaddr/multiaddr.go diff --git a/internal/client/network-types/multihash/multihash.go b/internal/client/network/types/multihash/multihash.go similarity index 100% rename from internal/client/network-types/multihash/multihash.go rename to internal/client/network/types/multihash/multihash.go diff --git a/internal/client/network-types/peer-id/peer_id.go b/internal/client/network/types/peer-id/peer_id.go similarity index 96% rename from internal/client/network-types/peer-id/peer_id.go rename to internal/client/network/types/peer-id/peer_id.go index 7a1ae521af..34a4aca092 100644 --- a/internal/client/network-types/peer-id/peer_id.go +++ b/internal/client/network/types/peer-id/peer_id.go @@ -3,7 +3,7 @@ package peerid import ( "crypto/rand" - "github.com/ChainSafe/gossamer/internal/client/network-types/multihash" + "github.com/ChainSafe/gossamer/internal/client/network/types/multihash" "github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/peer" ) diff --git a/internal/client/network-types/peer-id/peer_id_test.go b/internal/client/network/types/peer-id/peer_id_test.go similarity index 100% rename from internal/client/network-types/peer-id/peer_id_test.go rename to internal/client/network/types/peer-id/peer_id_test.go