From 194daa594d1fcaea171b64692b070d7369ddf65b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20B=C3=BClow?= <johannes.buelow@jmbit.de>
Date: Fri, 14 Mar 2025 12:46:30 +0100
Subject: [PATCH] more refractoring, adding makefile for tests

---
 Makefile   |  8 ++++++++
 error.go   | 22 ++++++++++++++++++++++
 session.go |  1 -
 smtpd.go   | 13 -------------
 4 files changed, 30 insertions(+), 14 deletions(-)
 create mode 100644 Makefile
 create mode 100644 error.go

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..60d96e1
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+test:
+	go test .
+
+dkim-proxy:
+	cd _examples && go get . && go build .
+
+testsum:
+	gotestsum --format testname
diff --git a/error.go b/error.go
new file mode 100644
index 0000000..40d9f9e
--- /dev/null
+++ b/error.go
@@ -0,0 +1,22 @@
+package smtpd
+
+import (
+  "errors"
+  "fmt"
+)
+// Error represents an Error reported in the SMTP session.
+type Error struct {
+	Code    int    // The integer error code
+	Message string // The error message
+}
+
+// Error returns a string representation of the SMTP error
+func (e Error) Error() string { 
+  return fmt.Sprintf("%d %s", e.Code, e.Message) 
+}
+
+// ErrServerClosed is returned by the Server's Serve and ListenAndServe,
+// methods after a call to Shutdown.
+var ErrServerClosed = errors.New("smtp: Server closed")
+
+
diff --git a/session.go b/session.go
index 44d6550..508a440 100644
--- a/session.go
+++ b/session.go
@@ -160,4 +160,3 @@ func (session *session) close() {
 	session.conn.Close()
 }
 
-
diff --git a/smtpd.go b/smtpd.go
index a24729f..584e5ab 100644
--- a/smtpd.go
+++ b/smtpd.go
@@ -83,19 +83,6 @@ type Peer struct {
 	TLS        *tls.ConnectionState // TLS Connection details, if on TLS
 }
 
-// Error represents an Error reported in the SMTP session.
-type Error struct {
-	Code    int    // The integer error code
-	Message string // The error message
-}
-
-// Error returns a string representation of the SMTP error
-func (e Error) Error() string { return fmt.Sprintf("%d %s", e.Code, e.Message) }
-
-// ErrServerClosed is returned by the Server's Serve and ListenAndServe,
-// methods after a call to Shutdown.
-var ErrServerClosed = errors.New("smtp: Server closed")
-
 func (srv *Server) newSession(c net.Conn) (s *session) {
 
 	s = &session{