Updating error messages to reflect their specific context.

Layr-Labs · Dec 11, 2024 · 7ca079f · 7ca079f
1 parent 4c25e75
commit 7ca079f
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 19 deletions.
diff --git a/pkg/user/admin/accept.go b/pkg/user/admin/accept.go
@@ -52,7 +52,7 @@ func acceptAdmin(
 
 	config, err := readAndValidateAcceptAdminConfig(cliCtx, logger)
 	if err != nil {
-		return eigenSdkUtils.WrapError("failed to read and validate user can call config", err)
+		return eigenSdkUtils.WrapError("failed to read and validate user admin accept config", err)
 	}
 	cliCtx.App.Metadata["network"] = config.ChainID.String()
 	elWriter, err := generator(logger, config)
@@ -141,7 +141,7 @@ func generateAcceptAdminWriter(
 		if err != nil {
 			return nil, eigenSdkUtils.WrapError("failed to create new eth client", err)
 		}
-		elWriter, err := common.GetELWriter(
+		return common.GetELWriter(
 			config.AccountAddress,
 			&config.SignerConfig,
 			ethClient,
@@ -152,6 +152,5 @@ func generateAcceptAdminWriter(
 			config.ChainID,
 			logger,
 		)
-		return elWriter, err
 	}
 }
diff --git a/pkg/user/admin/add_pending.go b/pkg/user/admin/add_pending.go
@@ -52,7 +52,7 @@ func addPendingAdmin(
 
 	config, err := readAndValidateAddPendingAdminConfig(cliCtx, logger)
 	if err != nil {
-		return eigenSdkUtils.WrapError("failed to read and validate user can call config", err)
+		return eigenSdkUtils.WrapError("failed to read and validate user admin add pending config", err)
 	}
 	cliCtx.App.Metadata["network"] = config.ChainID.String()
 	elWriter, err := generator(logger, config)
@@ -132,7 +132,7 @@ func generateAddPendingAdminWriter(
 		if err != nil {
 			return nil, eigenSdkUtils.WrapError("failed to create new eth client", err)
 		}
-		elWriter, err := common.GetELWriter(
+		return common.GetELWriter(
 			config.AccountAddress,
 			&config.SignerConfig,
 			ethClient,
@@ -143,7 +143,6 @@ func generateAddPendingAdminWriter(
 			config.ChainID,
 			logger,
 		)
-		return elWriter, err
 	}
 }
 

diff --git a/pkg/user/admin/is_admin.go b/pkg/user/admin/is_admin.go
@@ -50,7 +50,7 @@ func isAdmin(cliCtx *cli.Context, generator func(logging.Logger, *isAdminConfig)
 
 	config, err := readAndValidateIsAdminConfig(cliCtx, logger)
 	if err != nil {
-		return eigenSdkUtils.WrapError("failed to read and validate user can call config", err)
+		return eigenSdkUtils.WrapError("failed to read and validate user admin is admin config", err)
 	}
 	cliCtx.App.Metadata["network"] = config.ChainID.String()
 	elReader, err := generator(logger, config)

diff --git a/pkg/user/admin/is_pending.go b/pkg/user/admin/is_pending.go
@@ -55,7 +55,7 @@ func isPendingAdmin(
 
 	config, err := readAndValidateIsPendingAdminConfig(cliCtx, logger)
 	if err != nil {
-		return eigenSdkUtils.WrapError("failed to read and validate user can call config", err)
+		return eigenSdkUtils.WrapError("failed to read and validate user admin is pending config", err)
 	}
 	cliCtx.App.Metadata["network"] = config.ChainID.String()
 	elReader, err := generator(logger, config)

diff --git a/pkg/user/admin/list.go b/pkg/user/admin/list.go
@@ -53,7 +53,7 @@ func listAdmins(
 
 	config, err := readAndValidateListAdminsConfig(cliCtx, logger)
 	if err != nil {
-		return eigenSdkUtils.WrapError("failed to read and validate user can call config", err)
+		return eigenSdkUtils.WrapError("failed to read and validate user admin list config", err)
 	}
 	cliCtx.App.Metadata["network"] = config.ChainID.String()
 	elReader, err := generator(logger, config)

diff --git a/pkg/user/admin/list_pending.go b/pkg/user/admin/list_pending.go
@@ -55,7 +55,7 @@ func listPendingAdmins(
 
 	config, err := readAndValidateListPendingAdminsConfig(cliCtx, logger)
 	if err != nil {
-		return eigenSdkUtils.WrapError("failed to read and validate user can call config", err)
+		return eigenSdkUtils.WrapError("failed to read and validate user admin list pending config", err)
 	}
 	cliCtx.App.Metadata["network"] = config.ChainID.String()
 	elReader, err := generator(logger, config)

diff --git a/pkg/user/admin/remove.go b/pkg/user/admin/remove.go
@@ -52,7 +52,7 @@ func removeAdmin(
 
 	config, err := readAndValidateRemoveAdminConfig(cliCtx, logger)
 	if err != nil {
-		return eigenSdkUtils.WrapError("failed to read and validate user can call config", err)
+		return eigenSdkUtils.WrapError("failed to read and validate user admin remove config", err)
 	}
 	cliCtx.App.Metadata["network"] = config.ChainID.String()
 	elWriter, err := generator(logger, config)
@@ -132,7 +132,7 @@ func generateRemoveAdminWriter(
 		if err != nil {
 			return nil, eigenSdkUtils.WrapError("failed to create new eth client", err)
 		}
-		elWriter, err := common.GetELWriter(
+		return common.GetELWriter(
 			config.AccountAddress,
 			&config.SignerConfig,
 			ethClient,
@@ -143,7 +143,6 @@ func generateRemoveAdminWriter(
 			config.ChainID,
 			logger,
 		)
-		return elWriter, err
 	}
 }
 

diff --git a/pkg/user/admin/remove_pending.go b/pkg/user/admin/remove_pending.go
@@ -54,7 +54,7 @@ func removePendingAdmin(
 
 	config, err := readAndValidateRemovePendingAdminConfig(cliCtx, logger)
 	if err != nil {
-		return eigenSdkUtils.WrapError("failed to read and validate user can call config", err)
+		return eigenSdkUtils.WrapError("failed to read and validate user admin remove pending config", err)
 	}
 	cliCtx.App.Metadata["network"] = config.ChainID.String()
 	elWriter, err := generator(logger, config)
@@ -134,7 +134,7 @@ func generateRemovePendingAdminWriter(
 		if err != nil {
 			return nil, eigenSdkUtils.WrapError("failed to create new eth client", err)
 		}
-		elWriter, err := common.GetELWriter(
+		return common.GetELWriter(
 			config.AccountAddress,
 			&config.SignerConfig,
 			ethClient,
@@ -145,7 +145,6 @@ func generateRemovePendingAdminWriter(
 			config.ChainID,
 			logger,
 		)
-		return elWriter, err
 	}
 }
 

diff --git a/pkg/user/appointee/list.go b/pkg/user/appointee/list.go
@@ -54,7 +54,7 @@ func listAppointees(
 
 	config, err := readAndValidateListUsersConfig(cliCtx, logger)
 	if err != nil {
-		return eigenSdkUtils.WrapError("failed to read and validate user can call config", err)
+		return eigenSdkUtils.WrapError("failed to read and validate user appointee list config", err)
 	}
 
 	elReader, err := generator(logger, config)

diff --git a/pkg/user/appointee/remove.go b/pkg/user/appointee/remove.go
@@ -52,7 +52,7 @@ func removeUserPermission(
 
 	config, err := readAndValidateRemoveConfig(cliCtx, logger)
 	if err != nil {
-		return eigenSdkUtils.WrapError("failed to read and validate user can call config", err)
+		return eigenSdkUtils.WrapError("failed to read and validate user appointee remove config", err)
 	}
 	cliCtx.App.Metadata["network"] = config.ChainID.String()
 	permissionWriter, err := generator(logger, config)

diff --git a/pkg/user/appointee/set.go b/pkg/user/appointee/set.go
@@ -52,7 +52,7 @@ func setUserPermission(
 
 	config, err := readAndValidateSetConfig(cliCtx, logger)
 	if err != nil {
-		return eigenSdkUtils.WrapError("failed to read and validate user can call config", err)
+		return eigenSdkUtils.WrapError("failed to read and validate user appointee set config", err)
 	}
 	cliCtx.App.Metadata["network"] = config.ChainID.String()
 	permissionWriter, err := generator(logger, config)