Skip to content

Commit

Permalink
revise network-types
Browse files Browse the repository at this point in the history
  • Loading branch information
@timwu20
timwu20 committed Feb 24, 2025
1 parent 8d9a1bc commit 76fb97e
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion internal/client/network-gossip/bridge.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/client/network-gossip/bridge_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/client/network-gossip/network_gossip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/client/network-gossip/state_machine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions internal/client/network-gossip/state_machine_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/client/network-gossip/validator.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/client/network/config/config.go
View file
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions internal/client/network/event/event.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions internal/client/network/service/service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/client/network/sync/sync.go
View file
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/client/network-types/kad/kad.go → internal/client/network/types/kad/kad.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
0 ...ient/network-types/multiaddr/multiaddr.go → ...ient/network/types/multiaddr/multiaddr.go
View file
File renamed without changes.
0 ...ient/network-types/multihash/multihash.go → ...ient/network/types/multihash/multihash.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...l/client/network-types/peer-id/peer_id.go → ...l/client/network/types/peer-id/peer_id.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 ...ent/network-types/peer-id/peer_id_test.go → ...ent/network/types/peer-id/peer_id_test.go
View file
File renamed without changes.

0 comments on commit 76fb97e

Please sign in to comment.