From 88cc3b8c57508f92868788d136e3b02bcb1345d1 Mon Sep 17 00:00:00 2001 From: Andrew Richardson Date: Tue, 17 Aug 2021 15:21:55 -0400 Subject: [PATCH] Use consistent name for FirstTimeSetup hook Signed-off-by: Andrew Richardson --- internal/blockchain/blockchain_provider.go | 2 +- internal/blockchain/ethereum/besu/besu_provider.go | 2 +- internal/blockchain/ethereum/geth/geth_provider.go | 2 +- internal/stacks/stack_manager.go | 8 ++++---- internal/tokens/erc1155/erc1155_provider.go | 2 +- internal/tokens/tokens_provider.go | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/blockchain/blockchain_provider.go b/internal/blockchain/blockchain_provider.go index 51cbca58..85d9db2d 100644 --- a/internal/blockchain/blockchain_provider.go +++ b/internal/blockchain/blockchain_provider.go @@ -24,7 +24,7 @@ import ( type IBlockchainProvider interface { WriteConfig() error - PreFirstTimeSetup() error + FirstTimeSetup() error DeploySmartContracts() error PreStart() error PostStart() error diff --git a/internal/blockchain/ethereum/besu/besu_provider.go b/internal/blockchain/ethereum/besu/besu_provider.go index 46450c08..c8f9274c 100644 --- a/internal/blockchain/ethereum/besu/besu_provider.go +++ b/internal/blockchain/ethereum/besu/besu_provider.go @@ -34,7 +34,7 @@ func (p *BesuProvider) WriteConfig() error { return nil } -func (p *BesuProvider) PreFirstTimeSetup() error { +func (p *BesuProvider) FirstTimeSetup() error { return nil } diff --git a/internal/blockchain/ethereum/geth/geth_provider.go b/internal/blockchain/ethereum/geth/geth_provider.go index 8fff2a3e..17c6fa61 100644 --- a/internal/blockchain/ethereum/geth/geth_provider.go +++ b/internal/blockchain/ethereum/geth/geth_provider.go @@ -67,7 +67,7 @@ func (p *GethProvider) WriteConfig() error { return nil } -func (p *GethProvider) PreFirstTimeSetup() error { +func (p *GethProvider) FirstTimeSetup() error { volumeName := fmt.Sprintf("%s_geth", p.Stack.Name) gethConfigDir := path.Join(constants.StacksDir, p.Stack.Name, "blockchain") diff --git a/internal/stacks/stack_manager.go b/internal/stacks/stack_manager.go index 0f90802e..476186eb 100644 --- a/internal/stacks/stack_manager.go +++ b/internal/stacks/stack_manager.go @@ -439,8 +439,8 @@ func checkPortAvailable(port int) (bool, error) { func (s *StackManager) runFirstTimeSetup(verbose bool, options *StartOptions) error { workingDir := filepath.Join(constants.StacksDir, s.Stack.Name) - s.Log.Info("performing early initialization tasks") - if err := s.blockchainProvider.PreFirstTimeSetup(); err != nil { + s.Log.Info("initializing blockchain node") + if err := s.blockchainProvider.FirstTimeSetup(); err != nil { return err } @@ -487,8 +487,8 @@ func (s *StackManager) runFirstTimeSetup(verbose bool, options *StartOptions) er return err } - s.Log.Info("performing late initialization tasks") - if err := s.tokensProvider.PostFirstTimeSetup(); err != nil { + s.Log.Info("initializing token providers") + if err := s.tokensProvider.FirstTimeSetup(); err != nil { return err } return nil diff --git a/internal/tokens/erc1155/erc1155_provider.go b/internal/tokens/erc1155/erc1155_provider.go index 4f450a15..18ae94ae 100644 --- a/internal/tokens/erc1155/erc1155_provider.go +++ b/internal/tokens/erc1155/erc1155_provider.go @@ -36,7 +36,7 @@ func (p *ERC1155Provider) DeploySmartContracts() error { return DeployContracts(p.Stack, p.Log, p.Verbose) } -func (p *ERC1155Provider) PostFirstTimeSetup() error { +func (p *ERC1155Provider) FirstTimeSetup() error { for _, member := range p.Stack.Members { p.Log.Info(fmt.Sprintf("initializing tokens on member %s", member.ID)) tokenInitUrl := fmt.Sprintf("http://localhost:%d/api/v1/init", member.ExposedTokensPort) diff --git a/internal/tokens/tokens_provider.go b/internal/tokens/tokens_provider.go index 93ddcc2e..2896b253 100644 --- a/internal/tokens/tokens_provider.go +++ b/internal/tokens/tokens_provider.go @@ -24,7 +24,7 @@ import ( type ITokensProvider interface { DeploySmartContracts() error - PostFirstTimeSetup() error + FirstTimeSetup() error GetDockerServiceDefinitions() []*docker.ServiceDefinition GetFireflyConfig(m *types.Member) *core.TokensConfig }