From 958f90edc638ad32a3ba3d2dea67f1b22badb064 Mon Sep 17 00:00:00 2001
From: eyedeekay <hankhill19580@gmail.com>
Date: Tue, 27 May 2025 16:46:29 -0400
Subject: [PATCH] simplify common some more

---
 common/new.go      | 8 ++++++--
 common/resolver.go | 5 +++--
 common/types.go    | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/common/new.go b/common/new.go
index 3bb4452..c2de186 100644
--- a/common/new.go
+++ b/common/new.go
@@ -33,7 +33,8 @@ func OldNewSAM(address string) (*SAM, error) {
 		log.Debug("SAM hello successful")
 		s.SAMEmit.I2PConfig.SetSAMAddress(address)
 		s.Conn = conn
-		s.SAMResolver, err = NewSAMResolver(&s)
+		resolver, err := NewSAMResolver(&s)
+		s.SAMResolver = *resolver
 		if err != nil {
 			log.WithError(err).Error("Failed to create SAM resolver")
 			return nil, oops.Errorf("error creating resolver: %w", err)
@@ -72,10 +73,13 @@ func NewSAM(address string) (*SAM, error) {
 
 	s.SAMEmit.I2PConfig.SetSAMAddress(address)
 
-	if s.SAMResolver, err = NewSAMResolver(s); err != nil {
+	resolver, err := NewSAMResolver(s)
+	if err != nil {
 		logger.WithError(err).Error("Failed to create SAM resolver")
 		return nil, oops.Errorf("failed to create SAM resolver: %w", err)
 	}
+	s.SAMResolver = *resolver
+	logger.Debug("Successfully created new SAM instance")
 
 	return s, nil
 }
diff --git a/common/resolver.go b/common/resolver.go
index 006da9d..00a96f8 100644
--- a/common/resolver.go
+++ b/common/resolver.go
@@ -19,8 +19,9 @@ func NewSAMResolver(parent *SAM) (*SAMResolver, error) {
 func NewFullSAMResolver(address string) (*SAMResolver, error) {
 	log.WithField("address", address).Debug("Creating new full SAMResolver")
 	var s SAMResolver
-	var err error
-	s.SAM, err = NewSAM(address)
+	//var err error
+	sam, err := NewSAM(address)
+	s.SAM = sam
 	if err != nil {
 		log.WithError(err).Error("Failed to create new SAM instance")
 		return nil, err
diff --git a/common/types.go b/common/types.go
index 1afb3cd..01184a7 100644
--- a/common/types.go
+++ b/common/types.go
@@ -64,7 +64,7 @@ type SAMEmit struct {
 // Used for controlling I2Ps SAMv3.
 type SAM struct {
 	SAMEmit
-	*SAMResolver
+	SAMResolver
 	net.Conn
 
 	// Timeout for SAM connections