Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor chains/manager #2665

Closed
wants to merge 1 commit into from
Closed

Refactor chains/manager #2665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions api/admin/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@ import (

"github.com/ava-labs/avalanchego/api"
"github.com/ava-labs/avalanchego/api/server"
"github.com/ava-labs/avalanchego/chains"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/node/rpcchainvm"
"github.com/ava-labs/avalanchego/utils"
"github.com/ava-labs/avalanchego/utils/constants"
"github.com/ava-labs/avalanchego/utils/json"
"github.com/ava-labs/avalanchego/utils/logging"
"github.com/ava-labs/avalanchego/utils/perms"
"github.com/ava-labs/avalanchego/utils/profiler"
"github.com/ava-labs/avalanchego/vms"
"github.com/ava-labs/avalanchego/vms/registry"
)

Expand All @@ -40,14 +39,14 @@ var (
)

type Config struct {
Log logging.Logger
ProfileDir string
LogFactory logging.Factory
NodeConfig interface{}
ChainManager chains.Manager
HTTPServer server.PathAdderWithReadLock
VMRegistry registry.VMRegistry
VMManager vms.Manager
Log logging.Logger
ProfileDir string
LogFactory logging.Factory
NodeConfig interface{}
Aliaser ids.Aliaser
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Aliaser ids.Aliaser
ChainAliaser ids.Aliaser

HTTPServer server.PathAdderWithReadLock
VMRegistry registry.VMRegistry
VMManager rpcchainvm.Manager
}

// Admin is the API service for node admin management
Expand Down Expand Up @@ -165,15 +164,15 @@ func (a *Admin) AliasChain(_ *http.Request, args *AliasChainArgs, _ *api.EmptyRe
if len(args.Alias) > maxAliasLength {
return errAliasTooLong
}
chainID, err := a.ChainManager.Lookup(args.Chain)
chainID, err := a.Aliaser.Lookup(args.Chain)
if err != nil {
return err
}

a.lock.Lock()
defer a.lock.Unlock()

if err := a.ChainManager.Alias(chainID, args.Alias); err != nil {
if err := a.Aliaser.Alias(chainID, args.Alias); err != nil {
return err
}

Expand Down Expand Up @@ -205,7 +204,7 @@ func (a *Admin) GetChainAliases(_ *http.Request, args *GetChainAliasesArgs, repl
return err
}

reply.Aliases, err = a.ChainManager.Aliases(id)
reply.Aliases, err = a.Aliaser.Aliases(id)
return err
}

Expand Down
6 changes: 3 additions & 3 deletions api/admin/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ import (
"go.uber.org/mock/gomock"

"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/node/rpcchainvm"
"github.com/ava-labs/avalanchego/utils/logging"
"github.com/ava-labs/avalanchego/vms"
"github.com/ava-labs/avalanchego/vms/registry"
)

type loadVMsTest struct {
admin *Admin
ctrl *gomock.Controller
mockVMManager *vms.MockManager
mockVMManager *rpcchainvm.MockManager
mockVMRegistry *registry.MockVMRegistry
}

func initLoadVMsTest(t *testing.T) *loadVMsTest {
ctrl := gomock.NewController(t)

mockVMRegistry := registry.NewMockVMRegistry(ctrl)
mockVMManager := vms.NewMockManager(ctrl)
mockVMManager := rpcchainvm.NewMockManager(ctrl)

return &loadVMsTest{
admin: &Admin{Config: Config{
Expand Down
51 changes: 27 additions & 24 deletions api/info/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (

"go.uber.org/zap"

"github.com/ava-labs/avalanchego/chains"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/network"
"github.com/ava-labs/avalanchego/network/peer"
"github.com/ava-labs/avalanchego/node/rpcchainvm"
"github.com/ava-labs/avalanchego/snow/networking/benchlist"
"github.com/ava-labs/avalanchego/snow/validators"
"github.com/ava-labs/avalanchego/utils/constants"
Expand All @@ -24,8 +24,8 @@ import (
"github.com/ava-labs/avalanchego/utils/logging"
"github.com/ava-labs/avalanchego/utils/set"
"github.com/ava-labs/avalanchego/version"
"github.com/ava-labs/avalanchego/vms"
"github.com/ava-labs/avalanchego/vms/nftfx"
"github.com/ava-labs/avalanchego/vms/platformvm"
"github.com/ava-labs/avalanchego/vms/platformvm/signer"
"github.com/ava-labs/avalanchego/vms/propertyfx"
"github.com/ava-labs/avalanchego/vms/secp256k1fx"
Expand All @@ -36,13 +36,14 @@ var errNoChainProvided = errors.New("argument 'chain' not given")
// Info is the API service for unprivileged info on a node
type Info struct {
Parameters
log logging.Logger
validators validators.Manager
myIP ips.DynamicIPPort
networking network.Network
chainManager chains.Manager
vmManager vms.Manager
benchlist benchlist.Manager
log logging.Logger
validators validators.Manager
myIP ips.DynamicIPPort
networking network.Network
aliaser ids.Aliaser
platformVM *platformvm.VM
vmManager rpcchainvm.Manager
benchlist benchlist.Manager
}

type Parameters struct {
Expand All @@ -59,15 +60,16 @@ type Parameters struct {
AddPrimaryNetworkDelegatorFee uint64
AddSubnetValidatorFee uint64
AddSubnetDelegatorFee uint64
VMManager vms.Manager
VMManager rpcchainvm.Manager
}

func NewService(
parameters Parameters,
log logging.Logger,
validators validators.Manager,
chainManager chains.Manager,
vmManager vms.Manager,
aliaser ids.Aliaser,
platformVM *platformvm.VM,
vmManager rpcchainvm.Manager,
myIP ips.DynamicIPPort,
network network.Network,
benchlist benchlist.Manager,
Expand All @@ -78,14 +80,15 @@ func NewService(
server.RegisterCodec(codec, "application/json;charset=UTF-8")
return server, server.RegisterService(
&Info{
Parameters: parameters,
log: log,
validators: validators,
chainManager: chainManager,
vmManager: vmManager,
myIP: myIP,
networking: network,
benchlist: benchlist,
Parameters: parameters,
log: log,
validators: validators,
aliaser: aliaser,
platformVM: platformVM,
vmManager: vmManager,
myIP: myIP,
networking: network,
benchlist: benchlist,
},
"info",
)
Expand Down Expand Up @@ -203,7 +206,7 @@ func (i *Info) GetBlockchainID(_ *http.Request, args *GetBlockchainIDArgs, reply
zap.String("method", "getBlockchainID"),
)

bID, err := i.chainManager.Lookup(args.Alias)
bID, err := i.aliaser.Lookup(args.Alias)
reply.BlockchainID = bID
return err
}
Expand Down Expand Up @@ -240,7 +243,7 @@ func (i *Info) Peers(_ *http.Request, args *PeersArgs, reply *PeersReply) error
benchedIDs := i.benchlist.GetBenched(peer.ID)
benchedAliases := make([]string, len(benchedIDs))
for idx, id := range benchedIDs {
alias, err := i.chainManager.PrimaryAlias(id)
alias, err := i.aliaser.PrimaryAlias(id)
if err != nil {
return fmt.Errorf("failed to get primary alias for chain ID %s: %w", id, err)
}
Expand Down Expand Up @@ -282,11 +285,11 @@ func (i *Info) IsBootstrapped(_ *http.Request, args *IsBootstrappedArgs, reply *
if args.Chain == "" {
return errNoChainProvided
}
chainID, err := i.chainManager.Lookup(args.Chain)
chainID, err := i.aliaser.Lookup(args.Chain)
if err != nil {
return fmt.Errorf("there is no chain with alias/ID '%s'", args.Chain)
}
reply.IsBootstrapped = i.chainManager.IsBootstrapped(chainID)
reply.IsBootstrapped = i.platformVM.IsBootstrapped(chainID)
return nil
}

Expand Down
6 changes: 3 additions & 3 deletions api/info/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ import (
"go.uber.org/mock/gomock"

"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/node/rpcchainvm"
"github.com/ava-labs/avalanchego/utils/logging"
"github.com/ava-labs/avalanchego/vms"
)

var errTest = errors.New("non-nil error")

type getVMsTest struct {
info *Info
ctrl *gomock.Controller
mockVMManager *vms.MockManager
mockVMManager *rpcchainvm.MockManager
}

func initGetVMsTest(t *testing.T) *getVMsTest {
ctrl := gomock.NewController(t)
mockVMManager := vms.NewMockManager(ctrl)
mockVMManager := rpcchainvm.NewMockManager(ctrl)
return &getVMsTest{
info: &Info{
Parameters: Parameters{
Expand Down
21 changes: 10 additions & 11 deletions api/ipcs/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,29 @@ import (
"go.uber.org/zap"

"github.com/ava-labs/avalanchego/api"
"github.com/ava-labs/avalanchego/chains"
"github.com/ava-labs/avalanchego/ids"
"github.com/ava-labs/avalanchego/ipcs"
"github.com/ava-labs/avalanchego/utils/json"
"github.com/ava-labs/avalanchego/utils/logging"
)

type Service struct {
log logging.Logger
chainManager chains.Manager
lock sync.RWMutex
ipcs *ipcs.ChainIPCs
log logging.Logger
aliaser ids.Aliaser
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
aliaser ids.Aliaser
chainAliaser ids.AliaserReader

lock sync.RWMutex
ipcs *ipcs.ChainIPCs
}

func NewService(log logging.Logger, chainManager chains.Manager, ipcs *ipcs.ChainIPCs) (http.Handler, error) {
func NewService(log logging.Logger, aliaser ids.Aliaser, ipcs *ipcs.ChainIPCs) (http.Handler, error) {
server := rpc.NewServer()
codec := json.NewCodec()
server.RegisterCodec(codec, "application/json")
server.RegisterCodec(codec, "application/json;charset=UTF-8")
return server, server.RegisterService(
&Service{
log: log,
chainManager: chainManager,
ipcs: ipcs,
log: log,
aliaser: aliaser,
ipcs: ipcs,
},
"ipcs",
)
Expand All @@ -59,7 +58,7 @@ func (s *Service) PublishBlockchain(_ *http.Request, args *PublishBlockchainArgs
logging.UserString("blockchainID", args.BlockchainID),
)

chainID, err := s.chainManager.Lookup(args.BlockchainID)
chainID, err := s.aliaser.Lookup(args.BlockchainID)
if err != nil {
s.log.Error("chain lookup failed",
logging.UserString("blockchainID", args.BlockchainID),
Expand Down Expand Up @@ -98,7 +97,7 @@ func (s *Service) UnpublishBlockchain(_ *http.Request, args *UnpublishBlockchain
logging.UserString("blockchainID", args.BlockchainID),
)

chainID, err := s.chainManager.Lookup(args.BlockchainID)
chainID, err := s.aliaser.Lookup(args.BlockchainID)
if err != nil {
s.log.Error("chain lookup failed",
logging.UserString("blockchainID", args.BlockchainID),
Expand Down
58 changes: 0 additions & 58 deletions chains/test_manager.go
View file
Open in desktop

This file was deleted.

Loading