automigrated err2 handler func signatures

findy-network · Aug 23, 2023 · d9379fc · d9379fc
1 parent 7c45411
commit d9379fc
Show file tree

Hide file tree

Showing 31 changed files with 62 additions and 62 deletions.
diff --git a/cmd/agency/ops.go b/cmd/agency/ops.go
@@ -26,9 +26,9 @@ var CmdData = struct {
 }{}
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	flags := OpsCmd.PersistentFlags()
 	flags.StringVar(&CmdData.JWT, "jwt", "",

diff --git a/cmd/agent/agent.go b/cmd/agent/agent.go
@@ -29,9 +29,9 @@ var CmdData = struct {
 }{}
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	flags := AgentCmd.PersistentFlags()
 	flags.StringVar(&CmdData.JWT, "jwt", "",

diff --git a/cmd/agent/connect.go b/cmd/agent/connect.go
@@ -91,9 +91,9 @@ var (
 )
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	connectCmd.Flags().StringVar(&invitationStr, "invitation", "", "invitation json")
 	connectCmd.Flags().StringVar(&ourLabel, "label", "", "our Aries connection Label ")

diff --git a/cmd/agent/createcreddef.go b/cmd/agent/createcreddef.go
@@ -51,9 +51,9 @@ var createCredDefCmd = &cobra.Command{
 var tag string
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 	createCredDefCmd.Flags().StringVarP(&schemaID, "id", "i", "",
 		cmd.FlagInfo("Schema ID", "", getSchemaEnvs["id"]))
 	createCredDefCmd.Flags().StringVarP(&tag, "tag", "t", "", "tag of the creddef")

diff --git a/cmd/agent/createschema.go b/cmd/agent/createschema.go
@@ -58,9 +58,9 @@ var (
 )
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 	createSchemaCmd.Flags().StringVarP(&name, "name", "a", "", "schema name")
 	createSchemaCmd.Flags().StringVar(&version, "version", "", "schema version")
 	createSchemaCmd.MarkFlagRequired("name")

diff --git a/cmd/agent/getcreddef.go b/cmd/agent/getcreddef.go
@@ -71,9 +71,9 @@ var (
 )
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	flags := getCredDefCmd.Flags()
 	flags.StringVarP(&CredDefID, "id", "i", "",

diff --git a/cmd/agent/getschema.go b/cmd/agent/getschema.go
@@ -73,9 +73,9 @@ var (
 )
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	flags := getSchemaCmd.Flags()
 	flags.StringVarP(&schemaID, "schema-id", "i", "",

diff --git a/cmd/agent/invitation.go b/cmd/agent/invitation.go
@@ -67,9 +67,9 @@ var (
 )
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	invitationCmd.Flags().BoolVarP(&urlFormat,
 		"url", "u", false, "if set returns URL formatted invitation")

diff --git a/cmd/agent/listen.go b/cmd/agent/listen.go
@@ -103,9 +103,9 @@ func mySleep(_ time.Duration) {
 var stressTest bool
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	listenCmd.Flags().BoolVarP(&stressTest, "stress", "t", false,
 		"stress mode = immediate connection retry")

diff --git a/cmd/agent/ping.go b/cmd/agent/ping.go
@@ -50,9 +50,9 @@ var pingCmd = &cobra.Command{
 var andController bool
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 	pingCmd.Flags().BoolVarP(&andController, "and-controller", "a", false,
 		"ping service agent as well")
 	AgentCmd.AddCommand(pingCmd)

diff --git a/cmd/agent/salisten.go b/cmd/agent/salisten.go
@@ -130,9 +130,9 @@ var conn client.Conn
 var ack bool
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	saListenCmd.Flags().BoolVarP(&ack, "reply_ack", "a", true,
 		"used reply ack for all request")

diff --git a/cmd/agent/setimpl.go b/cmd/agent/setimpl.go
@@ -73,9 +73,9 @@ var auto bool
 var read bool
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 	enterModeCmd.Flags().BoolVarP(&auto, "auto", "a", false,
 		"set controller communication mode to auto")
 	enterModeCmd.Flags().BoolVarP(&read, "read", "r", false,

diff --git a/cmd/authn/add.go b/cmd/authn/add.go
@@ -43,9 +43,9 @@ var addCmd = &cobra.Command{
 }
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	addCmd.Flags().StringVar(&authnCmd.Token, "jwt", authnCmd.Token,
 		cmd.FlagInfo("Existing token to register a NEW authenticator", "", envs["jwt"]))

diff --git a/cmd/authn/authn.go b/cmd/authn/authn.go
@@ -49,9 +49,9 @@ var acatorCmd = &cobra.Command{
 }
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	flags := acatorCmd.PersistentFlags()
 	flags.StringVarP(&authnCmd.UserName, "user-name", "u", "",

diff --git a/cmd/authn/login.go b/cmd/authn/login.go
@@ -47,9 +47,9 @@ var loginCmd = &cobra.Command{
 }
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	acatorCmd.AddCommand(loginCmd)
 }
diff --git a/cmd/authn/register.go b/cmd/authn/register.go
@@ -46,9 +46,9 @@ var registerCmd = &cobra.Command{
 }
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	acatorCmd.AddCommand(registerCmd)
 }
diff --git a/cmd/bot/bot.go b/cmd/bot/bot.go
@@ -39,9 +39,9 @@ func PrintCmdData() {
 }
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	flags := botCmd.PersistentFlags()
 	flags.StringVar(&CmdData.JWT, "jwt", "",

diff --git a/cmd/bot/chat.go b/cmd/bot/chat.go
@@ -54,9 +54,9 @@ var chatCmd = &cobra.Command{
 }
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 	chatCmd.Flags().BoolVarP(&ack, "reply_ack", "a", true, "used reply ack for all request")
 	botCmd.AddCommand(chatCmd)
 }
diff --git a/cmd/bot/read.go b/cmd/bot/read.go
@@ -91,9 +91,9 @@ var readCmd = &cobra.Command{
 var ack bool
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 	readCmd.Flags().BoolVarP(&ack, "reply_ack", "a", true, "used reply ack for all request")
 	botCmd.AddCommand(readCmd)
 }

diff --git a/cmd/bot/start.go b/cmd/bot/start.go
@@ -77,9 +77,9 @@ var (
 )
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 	startCmd.Flags().StringVarP(&fType, "type", "t", ".yaml", "file type used for state machine load")
 	startCmd.Flags().StringVar(&serviceFSM, "service-fsm", "", "FSM file for service level state machine load")
 	botCmd.AddCommand(startCmd)

diff --git a/cmd/bot/uml.go b/cmd/bot/uml.go
@@ -54,9 +54,9 @@ var umlCmd = &cobra.Command{
 }
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 	umlCmd.Flags().StringVarP(&fType, "type", "t", ".yaml",
 		"file type used for state machine load")
 	botCmd.AddCommand(umlCmd)

diff --git a/cmd/connection/connection.go b/cmd/connection/connection.go
@@ -40,9 +40,9 @@ func PrintCmdData() {
 var conn client.Conn
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	flags := ConnectionCmd.PersistentFlags()
 	flags.StringVar(&CmdData.JWT, "jwt", "",

diff --git a/cmd/connection/issue.go b/cmd/connection/issue.go
@@ -57,9 +57,9 @@ var issueCmd = &cobra.Command{
 }
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	issueCmd.Flags().StringVar(&attrJSON, "attrs", "",
 		cmd.FlagInfo("attrs json", "", issueEnvs["attrs"]))

diff --git a/cmd/connection/reqproof.go b/cmd/connection/reqproof.go
@@ -61,9 +61,9 @@ var reqProofCmd = &cobra.Command{
 }
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	reqProofCmd.Flags().StringVar(&attrJSON, "attrs", "", "attrs json")
 

diff --git a/cmd/connection/status.go b/cmd/connection/status.go
@@ -59,9 +59,9 @@ var statusCmd = &cobra.Command{
 var MyTypeID int32
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	statusCmd.Flags().StringVarP(&MyProtocolID, "id", "i", "", "protocol id for continue")
 	statusCmd.Flags().Int32VarP(&MyTypeID, "type", "t", 4, "4=trust ping, 1=issue, ... see usage")

diff --git a/cmd/connection/trustping.go b/cmd/connection/trustping.go
@@ -56,8 +56,8 @@ func trustping(_ *cobra.Command, _ []string) (err error) {
 }
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 	ConnectionCmd.AddCommand(pingCmd)
 }
diff --git a/cmd/connection/unpause.go b/cmd/connection/unpause.go
@@ -69,9 +69,9 @@ var (
 )
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	unpauseCmd.Flags().StringVarP(&MyProtocolID, "id", "i", "", "protocol id for continue")
 	unpauseCmd.Flags().BoolVarP(&ACK, "ack", "a", true, "how to proceed with the protocol")

diff --git a/cmd/newkey.go b/cmd/newkey.go
@@ -28,9 +28,9 @@ var newKeyCmd = &cobra.Command{
 }
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	rootCmd.AddCommand(newKeyCmd)
 }
diff --git a/cmd/root.go b/cmd/root.go
@@ -130,9 +130,9 @@ var rootEnvs = map[string]string{
 }
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		log.Println(err)
-	})
+	}))
 
 	cobra.OnInitialize(initConfig)
 

diff --git a/cmd/version.go b/cmd/version.go
@@ -24,9 +24,9 @@ var versionCmd = &cobra.Command{
 }
 
 func init() {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		fmt.Println(err)
-	})
+	}))
 
 	rootCmd.AddCommand(versionCmd)
 }
diff --git a/completionhelp/wallet.go b/completionhelp/wallet.go
@@ -10,9 +10,9 @@ import (
 )
 
 func WalletLocations() []string {
-	defer err2.Catch(func(err error) {
+	defer err2.Catch(err2.Err(func(err error) {
 		_, _ = fmt.Fprintln(os.Stderr, err)
-	})
+	}))
 
 	home := try.To1(os.UserHomeDir())
 	indyWallets := filepath.Join(home, ".indy_client/wallet")