Refactor daemon, add more tests (#1039)

Refactors daemon cmd into separate, testable pieces.
algorand · Jun 29, 2022 · f3f1177 · f3f1177
1 parent 997719a
commit f3f1177
Show file tree

Hide file tree

Showing 8 changed files with 497 additions and 262 deletions.
diff --git a/cmd/algorand-indexer/api_config.go b/cmd/algorand-indexer/api_config.go
@@ -22,7 +22,7 @@ var apiConfigCmd = &cobra.Command{
 	Long:  "api configuration",
 	Run: func(cmd *cobra.Command, args []string) {
 		var err error
-		config.BindFlags(cmd)
+		config.BindFlagSet(cmd.Flags())
 		err = configureLogger()
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "failed to configure logger: %v", err)
@@ -35,22 +35,21 @@ var apiConfigCmd = &cobra.Command{
 			panic(exit{1})
 		}
 
-		options := makeOptions()
+		var potentialDisabledMapConfig *api.DisabledMapConfig
 		if suppliedAPIConfigFile != "" {
-			potentialDisabledMapConfig, err := api.MakeDisabledMapConfigFromFile(swag, suppliedAPIConfigFile)
+			potentialDisabledMapConfig, err = api.MakeDisabledMapConfigFromFile(swag, suppliedAPIConfigFile)
 			if err != nil {
 				fmt.Fprintf(os.Stderr, "failed to created disabled map config from file: %v", err)
 				panic(exit{1})
 			}
-			options.DisabledMapConfig = potentialDisabledMapConfig
 		}
 
 		var displayDisabledMapConfig *api.DisplayDisabledMap
 		// Show a limited subset
 		if !showAllDisabled {
-			displayDisabledMapConfig = api.MakeDisplayDisabledMapFromConfig(swag, options.DisabledMapConfig, true)
+			displayDisabledMapConfig = api.MakeDisplayDisabledMapFromConfig(swag, potentialDisabledMapConfig, true)
 		} else {
-			displayDisabledMapConfig = api.MakeDisplayDisabledMapFromConfig(swag, options.DisabledMapConfig, false)
+			displayDisabledMapConfig = api.MakeDisplayDisabledMapFromConfig(swag, potentialDisabledMapConfig, false)
 		}
 
 		output, err := displayDisabledMapConfig.String()