From d5c26ae59339695623a64afdaeb07dee7161a9fd Mon Sep 17 00:00:00 2001 From: Ophestra Umiker Date: Sat, 12 Oct 2024 02:11:43 +0900 Subject: fortify: move error handling to separate file Error handling here is way too monstrous due to terrible design of the internal/app package. Since rewriting internal/app will take a while, error handling is moved out of main to improve readability. Signed-off-by: Ophestra Umiker --- error.go | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 error.go (limited to 'error.go') diff --git a/error.go b/error.go new file mode 100644 index 00000000..ee48684a --- /dev/null +++ b/error.go @@ -0,0 +1,61 @@ +package main + +import ( + "errors" + "fmt" + "os" + + "git.ophivana.moe/cat/fortify/internal/app" +) + +func logWaitError(err error) { + var e *app.BaseError + if !app.AsBaseError(err, &e) { + fmt.Println("fortify: wait failed:", err) + } else { + // Wait only returns either *app.ProcessError or *app.StateStoreError wrapped in a *app.BaseError + var se *app.StateStoreError + if !errors.As(err, &se) { + // does not need special handling + fmt.Print("fortify: " + e.Message()) + } else { + // inner error are either unwrapped store errors + // or joined errors returned by *appSealTx revert + // wrapped in *app.BaseError + var ej app.RevertCompoundError + if !errors.As(se.InnerErr, &ej) { + // does not require special handling + fmt.Print("fortify: " + e.Message()) + } else { + errs := ej.Unwrap() + + // every error here is wrapped in *app.BaseError + for _, ei := range errs { + var eb *app.BaseError + if !errors.As(ei, &eb) { + // unreachable + fmt.Println("fortify: invalid error type returned by revert:", ei) + } else { + // print inner *app.BaseError message + fmt.Print("fortify: " + eb.Message()) + } + } + } + } + } +} + +func logBaseError(err error, message string) { + var e *app.BaseError + + if app.AsBaseError(err, &e) { + fmt.Print("fortify: " + e.Message()) + } else { + fmt.Println(message, err) + } +} + +func fatalf(format string, a ...any) { + fmt.Printf("fortify: "+format, a...) + os.Exit(1) +} -- cgit v1.3.1