Fix CI failures

algorand · Jun 22, 2022 · b762879 · b762879
1 parent 24e4621
commit b762879
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 35 deletions.
diff --git a/cmd/algorand-indexer/daemon.go b/cmd/algorand-indexer/daemon.go
@@ -71,25 +71,19 @@ type daemonConfig struct {
 	genesisJSONPath           string
 }
 
-func newDaemonConfig() *daemonConfig {
-	return &daemonConfig{}
-}
-
-func newDaemonCmd(config *daemonConfig) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "daemon",
-		Short: "run indexer daemon",
-		Long:  "run indexer daemon. Serve api on HTTP.",
-		//Args:
-		Run: func(cmd *cobra.Command, args []string) {
-			config.flags = cmd.Flags()
-			if err := runDaemon(config); err != nil {
-				panic(exit{1})
-			}
-		},
-	}
-	config.setFlags(cmd.Flags())
-	return cmd
+var daemonCfg = &daemonConfig{}
+
+var daemonCmd = &cobra.Command{
+	Use:   "daemon",
+	Short: "run indexer daemon",
+	Long:  "run indexer daemon. Serve api on HTTP.",
+	//Args:
+	Run: func(cmd *cobra.Command, args []string) {
+		daemonCfg.flags = cmd.Flags()
+		if err := runDaemon(daemonCfg); err != nil {
+			panic(exit{1})
+		}
+	},
 }
 
 func configureIndexerDataDir(cfg *daemonConfig) error {
@@ -163,7 +157,7 @@ func loadIndexerParamConfig(cfg *daemonConfig) error {
 	// If we auto-loaded configs but a user supplied them as well, we have an error
 	if paramConfigFound {
 		if cfg.suppliedAPIConfigFile != "" {
-			err = fmt.Errorf("api parameter configuration was found in data directory (%s) as well as supplied via command line.  Only provide one.",
+			err = fmt.Errorf("api parameter configuration was found in data directory (%s) as well as supplied via command line.  Only provide one",
 				filepath.Join(cfg.indexerDataDir, autoLoadParameterConfigName))
 			logger.WithError(err).Errorf("indexer parameter config error: %v", err)
 			return err
@@ -298,7 +292,7 @@ func runDaemon(daemonConfig *daemonConfig) error {
 	var wg sync.WaitGroup
 	if bot != nil {
 		wg.Add(1)
-		go runBlockImporter(daemonConfig, &wg, db, availableCh, bot, ctx, &opts)
+		go runBlockImporter(ctx, daemonConfig, &wg, db, availableCh, bot, &opts)
 	} else {
 		logger.Info("No block importer configured.")
 	}
@@ -313,7 +307,7 @@ func runDaemon(daemonConfig *daemonConfig) error {
 	return err
 }
 
-func runBlockImporter(cfg *daemonConfig, wg *sync.WaitGroup, db idb.IndexerDb, dbAvailable chan struct{}, bot fetcher.Fetcher, ctx context.Context, opts *idb.IndexerDbOptions) {
+func runBlockImporter(ctx context.Context, cfg *daemonConfig, wg *sync.WaitGroup, db idb.IndexerDb, dbAvailable chan struct{}, bot fetcher.Fetcher, opts *idb.IndexerDbOptions) {
 	// Need to redefine exitHandler() for every go-routine
 	defer exitHandler()
 	defer wg.Done()

diff --git a/cmd/algorand-indexer/daemon_test.go b/cmd/algorand-indexer/daemon_test.go
@@ -123,7 +123,7 @@ func createTempDir(t *testing.T) string {
 func TestConfigWithEnableAllParamsExpectError(t *testing.T) {
 	indexerDataDir := createTempDir(t)
 	defer os.RemoveAll(indexerDataDir)
-	daemonConfig := newDaemonConfig()
+	daemonConfig := &daemonConfig{}
 	daemonConfig.flags = pflag.NewFlagSet("indexer", 0)
 	daemonConfig.indexerDataDir = indexerDataDir
 	daemonConfig.enableAllParameters = true
@@ -139,7 +139,7 @@ func TestConfigDoesNotExistExpectError(t *testing.T) {
 	indexerDataDir := createTempDir(t)
 	defer os.RemoveAll(indexerDataDir)
 	tempConfigFile := indexerDataDir + "/indexer.yml"
-	daemonConfig := newDaemonConfig()
+	daemonConfig := &daemonConfig{}
 	daemonConfig.flags = pflag.NewFlagSet("indexer", 0)
 	daemonConfig.indexerDataDir = indexerDataDir
 	daemonConfig.configFile = tempConfigFile
@@ -157,7 +157,7 @@ func TestConfigInvalidExpectError(t *testing.T) {
 	defer os.RemoveAll(indexerDataDir)
 	tempConfigFile := indexerDataDir + "/indexer-alt.yml"
 	os.WriteFile(tempConfigFile, []byte(";;;"), fs.ModePerm)
-	daemonConfig := newDaemonConfig()
+	daemonConfig := &daemonConfig{}
 	daemonConfig.flags = pflag.NewFlagSet("indexer", 0)
 	daemonConfig.indexerDataDir = indexerDataDir
 	daemonConfig.configFile = tempConfigFile
@@ -176,7 +176,7 @@ func TestConfigSpecifiedTwiceExpectError(t *testing.T) {
 	defer os.RemoveAll(indexerDataDir)
 	tempConfigFile := indexerDataDir + "/indexer.yml"
 	os.WriteFile(tempConfigFile, []byte{}, fs.ModePerm)
-	daemonConfig := newDaemonConfig()
+	daemonConfig := &daemonConfig{}
 	daemonConfig.flags = pflag.NewFlagSet("indexer", 0)
 	daemonConfig.indexerDataDir = indexerDataDir
 	daemonConfig.configFile = tempConfigFile
@@ -195,12 +195,12 @@ func TestLoadAPIConfigGivenAutoLoadAndUserSuppliedExpectError(t *testing.T) {
 	autoloadPath := filepath.Join(indexerDataDir, autoLoadParameterConfigName)
 	userSuppliedPath := filepath.Join(indexerDataDir, "foobar.yml")
 	os.WriteFile(autoloadPath, []byte{}, fs.ModePerm)
-	cfg := newDaemonConfig()
+	cfg := &daemonConfig{}
 	cfg.indexerDataDir = indexerDataDir
 	cfg.suppliedAPIConfigFile = userSuppliedPath
 
 	err := loadIndexerParamConfig(cfg)
-	expectedErr := fmt.Errorf("api parameter configuration was found in data directory (%s) as well as supplied via command line.  Only provide one.",
+	expectedErr := fmt.Errorf("api parameter configuration was found in data directory (%s) as well as supplied via command line.  Only provide one",
 		autoloadPath)
 	if err.Error() != expectedErr.Error() {
 		t.Fatalf("expected error %v, but got %v", expectedErr, err)
@@ -212,7 +212,7 @@ func TestLoadAPIConfigGivenUserSuppliedExpectSuccess(t *testing.T) {
 	defer os.RemoveAll(indexerDataDir)
 
 	userSuppliedPath := filepath.Join(indexerDataDir, "foobar.yml")
-	cfg := newDaemonConfig()
+	cfg := &daemonConfig{}
 	cfg.indexerDataDir = indexerDataDir
 	cfg.suppliedAPIConfigFile = userSuppliedPath
 
@@ -228,7 +228,7 @@ func TestLoadAPIConfigGivenAutoLoadExpectSuccess(t *testing.T) {
 
 	autoloadPath := filepath.Join(indexerDataDir, autoLoadParameterConfigName)
 	os.WriteFile(autoloadPath, []byte{}, fs.ModePerm)
-	cfg := newDaemonConfig()
+	cfg := &daemonConfig{}
 	cfg.indexerDataDir = indexerDataDir
 
 	err := loadIndexerParamConfig(cfg)
@@ -239,7 +239,7 @@ func TestLoadAPIConfigGivenAutoLoadExpectSuccess(t *testing.T) {
 }
 
 func TestIndexerDataDirNotProvidedExpectError(t *testing.T) {
-	cfg := newDaemonConfig()
+	cfg := &daemonConfig{}
 
 	expectedErr := "indexer data directory was not provided"
 
@@ -251,7 +251,7 @@ func TestIndexerDataDirCreateFailExpectError(t *testing.T) {
 	defer os.RemoveAll(indexerDataDir)
 
 	invalidDir := filepath.Join(indexerDataDir, "foo", "bar")
-	cfg := newDaemonConfig()
+	cfg := &daemonConfig{}
 	cfg.indexerDataDir = invalidDir
 
 	assert.Error(t, configureIndexerDataDir(cfg))
@@ -261,7 +261,7 @@ func TestIndexerPidFileExpectSuccess(t *testing.T) {
 	indexerDataDir := createTempDir(t)
 	defer os.RemoveAll(indexerDataDir)
 
-	cfg := newDaemonConfig()
+	cfg := &daemonConfig{}
 	cfg.pidFilePath = path.Join(indexerDataDir, "pidFile")
 	assert.NoError(t, createIndexerPidFile(cfg))
 }
@@ -271,7 +271,7 @@ func TestIndexerPidFileCreateFailExpectError(t *testing.T) {
 	defer os.RemoveAll(indexerDataDir)
 
 	invalidDir := filepath.Join(indexerDataDir, "foo", "bar")
-	cfg := newDaemonConfig()
+	cfg := &daemonConfig{}
 	cfg.pidFilePath = invalidDir
 
 	cfg.flags = pflag.NewFlagSet("indexer", 0)

diff --git a/cmd/algorand-indexer/main.go b/cmd/algorand-indexer/main.go
@@ -115,7 +115,7 @@ func init() {
 
 	rootCmd.AddCommand(importCmd)
 	importCmd.Hidden = true
-	daemonCmd := newDaemonCmd(newDaemonConfig())
+	daemonCfg.setFlags(daemonCmd.Flags())
 	rootCmd.AddCommand(daemonCmd)
 	rootCmd.AddCommand(apiConfigCmd)