From 71620046687a14acad2ed49317d3003ac1fe84af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Wed, 11 Oct 2023 12:21:35 +0200 Subject: transaction: Do not make Transaction to implement error interface anymore As per previous commit, Transaction can't be used anymore as an error value, but we instead we always return the status code. --- transaction.go | 6 ------ transaction_test.go | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/transaction.go b/transaction.go index 5957071..2809614 100644 --- a/transaction.go +++ b/transaction.go @@ -126,8 +126,6 @@ func cbPAMConv(s C.int, msg *C.char, c C.uintptr_t) (*C.char, C.int) { } // Transaction is the application's handle for a PAM transaction. -// -//nolint:errname type Transaction struct { handle *C.pam_handle_t conv *C.struct_pam_conv @@ -217,10 +215,6 @@ func start(service, user string, handler ConversationHandler, confDir string) (* return t, nil } -func (t *Transaction) Error() string { - return Error(t.lastStatus.Load()).Error() -} - // Item is a an PAM information type. type Item int diff --git a/transaction_test.go b/transaction_test.go index 62b4ce1..0e3a481 100644 --- a/transaction_test.go +++ b/transaction_test.go @@ -512,7 +512,7 @@ func Test_Error(t *testing.T) { if err != nil { var status Error if !errors.As(err, &status) || err.Error() != status.Error() { - t.Fatalf("error #unexpected status %v vs %v", err.Error(), + t.Fatalf("error #unexpected status %#v vs %#v", err.Error(), status.Error()) } } -- cgit v1.2.3