-
Notifications
You must be signed in to change notification settings - Fork 670
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Joshua Kim <20001595+joshua-kim@users.noreply.github.com>
- Loading branch information
1 parent
813bd48
commit 357bc93
Showing
4 changed files
with
330 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| // Copyright (C) 2019-2024, Ava Labs, Inc. All rights reserved. | ||
| // See the file LICENSE for licensing terms. | ||
|
|
||
| package chains | ||
|
|
||
| import ( | ||
| "errors" | ||
| "sync" | ||
|
|
||
| "github.com/ava-labs/avalanchego/ids" | ||
| "github.com/ava-labs/avalanchego/subnets" | ||
| "github.com/ava-labs/avalanchego/utils/constants" | ||
| ) | ||
|
|
||
| var ErrNoPrimaryNetworkConfig = errors.New("no subnet config for primary network found") | ||
|
|
||
| func NewSubnets( | ||
| nodeID ids.NodeID, | ||
| configs map[ids.ID]subnets.Config, | ||
| ) (*Subnets, error) { | ||
| if _, ok := configs[constants.PrimaryNetworkID]; !ok { | ||
| return nil, ErrNoPrimaryNetworkConfig | ||
| } | ||
|
|
||
| s := &Subnets{ | ||
| nodeID: nodeID, | ||
| configs: configs, | ||
| subnets: make(map[ids.ID]subnets.Subnet), | ||
| } | ||
|
|
||
| _ = s.Add(constants.PrimaryNetworkID) | ||
| return s, nil | ||
| } | ||
|
|
||
| // Subnets holds the currently running subnets on this node | ||
| type Subnets struct { | ||
| nodeID ids.NodeID | ||
| configs map[ids.ID]subnets.Config | ||
|
|
||
| lock sync.Mutex | ||
| subnets map[ids.ID]subnets.Subnet | ||
| } | ||
|
|
||
| // Add a subnet that is being run on this node | ||
| func (s *Subnets) Add(subnetID ids.ID) bool { | ||
| s.lock.Lock() | ||
| defer s.lock.Unlock() | ||
|
|
||
| if _, ok := s.subnets[subnetID]; ok { | ||
| return false | ||
| } | ||
|
|
||
| // Default to the primary network config if a subnet config was not | ||
| // specified | ||
| config, ok := s.configs[subnetID] | ||
| if !ok { | ||
| config = s.configs[constants.PrimaryNetworkID] | ||
| } | ||
|
|
||
| s.subnets[subnetID] = subnets.New(s.nodeID, config) | ||
| return true | ||
| } | ||
|
|
||
| // Get returns a subnet if it is being run on this node | ||
| func (s *Subnets) Get(subnetID ids.ID) (subnets.Subnet, bool) { | ||
| s.lock.Lock() | ||
| defer s.lock.Unlock() | ||
|
|
||
| subnet, ok := s.subnets[subnetID] | ||
| return subnet, ok | ||
| } | ||
|
|
||
| // Bootstrapping returns subnets that have any chains that are still | ||
| // bootstrapping. | ||
| func (s *Subnets) Bootstrapping() []ids.ID { | ||
| s.lock.Lock() | ||
| defer s.lock.Unlock() | ||
|
|
||
| subnetsBootstrapping := make([]ids.ID, 0, len(s.subnets)) | ||
| for subnetID, subnet := range s.subnets { | ||
| if !subnet.IsBootstrapped() { | ||
| subnetsBootstrapping = append(subnetsBootstrapping, subnetID) | ||
| } | ||
| } | ||
|
|
||
| return subnetsBootstrapping | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,180 @@ | ||
| // Copyright (C) 2019-2024, Ava Labs, Inc. All rights reserved. | ||
| // See the file LICENSE for licensing terms. | ||
|
|
||
| package chains | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/ava-labs/avalanchego/ids" | ||
| "github.com/ava-labs/avalanchego/subnets" | ||
| "github.com/ava-labs/avalanchego/utils/constants" | ||
| ) | ||
|
|
||
| func TestNewSubnets(t *testing.T) { | ||
| require := require.New(t) | ||
| config := map[ids.ID]subnets.Config{ | ||
| constants.PrimaryNetworkID: {}, | ||
| } | ||
|
|
||
| subnets, err := NewSubnets(ids.EmptyNodeID, config) | ||
| require.NoError(err) | ||
|
|
||
| subnet, ok := subnets.Get(constants.PrimaryNetworkID) | ||
| require.True(ok) | ||
| require.Equal(subnet.Config(), config[constants.PrimaryNetworkID]) | ||
| } | ||
|
|
||
| func TestNewSubnets_NoPrimaryNetworkConfig(t *testing.T) { | ||
| require := require.New(t) | ||
| config := map[ids.ID]subnets.Config{} | ||
|
|
||
| _, err := NewSubnets(ids.EmptyNodeID, config) | ||
| require.ErrorIs(err, ErrNoPrimaryNetworkConfig) | ||
| } | ||
|
|
||
| func TestSubnetsAdd(t *testing.T) { | ||
| testSubnetID := ids.GenerateTestID() | ||
|
|
||
| type add struct { | ||
| subnetID ids.ID | ||
| want bool | ||
| } | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| adds []add | ||
| }{ | ||
| { | ||
| name: "adding duplicate subnet is a noop", | ||
| adds: []add{ | ||
| { | ||
| subnetID: testSubnetID, | ||
| want: true, | ||
| }, | ||
| { | ||
| subnetID: testSubnetID, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| name: "adding unique subnets succeeds", | ||
| adds: []add{ | ||
| { | ||
| subnetID: ids.GenerateTestID(), | ||
| want: true, | ||
| }, | ||
| { | ||
| subnetID: ids.GenerateTestID(), | ||
| want: true, | ||
| }, | ||
| { | ||
| subnetID: ids.GenerateTestID(), | ||
| want: true, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| require := require.New(t) | ||
| config := map[ids.ID]subnets.Config{ | ||
| constants.PrimaryNetworkID: {}, | ||
| } | ||
| subnets, err := NewSubnets(ids.EmptyNodeID, config) | ||
| require.NoError(err) | ||
|
|
||
| for _, add := range tt.adds { | ||
| got := subnets.Add(add.subnetID) | ||
| require.Equal(got, add.want) | ||
|
|
||
| _, ok := subnets.Get(add.subnetID) | ||
| require.Equal(add.want, ok) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestSubnetConfigs(t *testing.T) { | ||
| testSubnetID := ids.GenerateTestID() | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| config map[ids.ID]subnets.Config | ||
| subnetID ids.ID | ||
| want subnets.Config | ||
| }{ | ||
| { | ||
| name: "default to primary network config", | ||
| config: map[ids.ID]subnets.Config{ | ||
| constants.PrimaryNetworkID: {}, | ||
| }, | ||
| subnetID: testSubnetID, | ||
| want: subnets.Config{}, | ||
| }, | ||
| { | ||
| name: "use subnet config", | ||
| config: map[ids.ID]subnets.Config{ | ||
| constants.PrimaryNetworkID: {}, | ||
| testSubnetID: { | ||
| GossipConfig: subnets.GossipConfig{ | ||
| AcceptedFrontierValidatorSize: 123456789, | ||
| }, | ||
| }, | ||
| }, | ||
| subnetID: testSubnetID, | ||
| want: subnets.Config{ | ||
| GossipConfig: subnets.GossipConfig{ | ||
| AcceptedFrontierValidatorSize: 123456789, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| require := require.New(t) | ||
|
|
||
| subnets, err := NewSubnets(ids.EmptyNodeID, tt.config) | ||
| require.NoError(err) | ||
|
|
||
| ok := subnets.Add(tt.subnetID) | ||
| require.True(ok) | ||
|
|
||
| subnet, ok := subnets.Get(tt.subnetID) | ||
| require.True(ok) | ||
|
|
||
| require.Equal(tt.want, subnet.Config()) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestSubnetsBootstrapping(t *testing.T) { | ||
| require := require.New(t) | ||
|
|
||
| config := map[ids.ID]subnets.Config{ | ||
| constants.PrimaryNetworkID: {}, | ||
| } | ||
|
|
||
| subnets, err := NewSubnets(ids.EmptyNodeID, config) | ||
| require.NoError(err) | ||
|
|
||
| subnetID := ids.GenerateTestID() | ||
| chainID := ids.GenerateTestID() | ||
|
|
||
| subnets.Add(subnetID) | ||
| subnet, ok := subnets.Get(subnetID) | ||
| require.True(ok) | ||
|
|
||
| // Start bootstrapping | ||
| subnet.AddChain(chainID) | ||
| bootstrapping := subnets.Bootstrapping() | ||
| require.Contains(bootstrapping, subnetID) | ||
|
|
||
| // Finish bootstrapping | ||
| subnet.Bootstrapped(chainID) | ||
| require.Empty(subnets.Bootstrapping()) | ||
| } |
Oops, something went wrong.