From 4c863103f52c6ce5d449ce8a4dcf38a893913992 Mon Sep 17 00:00:00 2001
From: Lorenz Schori <lo@znerol.ch>
Date: Thu, 11 Apr 2019 07:48:30 +0200
Subject: [PATCH] Refactor: Rename ACMETxtPost struct into Challenge

---
 acmetxt.go  | 6 +++---
 api.go      | 2 +-
 db.go       | 2 +-
 db_test.go  | 8 ++++----
 dns_test.go | 2 +-
 types.go    | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/acmetxt.go b/acmetxt.go
index 63454a6..838cb68 100644
--- a/acmetxt.go
+++ b/acmetxt.go
@@ -12,12 +12,12 @@ import (
 type ACMETxt struct {
 	Username uuid.UUID
 	Password string
-	ACMETxtPost
+	Challenge
 	AllowFrom cidrslice
 }
 
-// ACMETxtPost holds the DNS part of the ACMETxt struct
-type ACMETxtPost struct {
+// Challenge holds the DNS part of the ACMETxt struct
+type Challenge struct {
 	Subdomain string `json:"subdomain"`
 	Value     string `json:"txt"`
 }
diff --git a/api.go b/api.go
index edff337..5bff782 100644
--- a/api.go
+++ b/api.go
@@ -91,7 +91,7 @@ func webUpdatePost(w http.ResponseWriter, r *http.Request, _ httprouter.Params)
 		updStatus = http.StatusBadRequest
 		upd = jsonError("bad_txt")
 	} else if validSubdomain(a.Subdomain) && validTXT(a.Value) {
-		err := DB.Update(a.ACMETxtPost)
+		err := DB.Update(a.Challenge)
 		if err != nil {
 			log.WithFields(log.Fields{"error": err.Error()}).Debug("Error while trying to update record")
 			updStatus = http.StatusInternalServerError
diff --git a/db.go b/db.go
index 358bde7..616b3ad 100644
--- a/db.go
+++ b/db.go
@@ -281,7 +281,7 @@ func (d *acmedb) GetTXTForDomain(domain string) ([]string, error) {
 	return txts, nil
 }
 
-func (d *acmedb) Update(a ACMETxtPost) error {
+func (d *acmedb) Update(a Challenge) error {
 	d.Lock()
 	defer d.Unlock()
 	var err error
diff --git a/db_test.go b/db_test.go
index beca9c1..4c68fb7 100644
--- a/db_test.go
+++ b/db_test.go
@@ -161,7 +161,7 @@ func TestQueryExecErrors(t *testing.T) {
 		t.Errorf("Expected error from exec in Register, but got none")
 	}
 	reg.Value = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-	err = DB.Update(reg.ACMETxtPost)
+	err = DB.Update(reg.Challenge)
 	if err == nil {
 		t.Errorf("Expected error from exec in Update, but got none")
 	}
@@ -238,10 +238,10 @@ func TestGetTXTForDomain(t *testing.T) {
 	txtval2 := "___validation_token_received_YEAH_the_ca___"
 
 	reg.Value = txtval1
-	_ = DB.Update(reg.ACMETxtPost)
+	_ = DB.Update(reg.Challenge)
 
 	reg.Value = txtval2
-	_ = DB.Update(reg.ACMETxtPost)
+	_ = DB.Update(reg.Challenge)
 
 	regDomainSlice, err := DB.GetTXTForDomain(reg.Subdomain)
 	if err != nil {
@@ -294,7 +294,7 @@ func TestUpdate(t *testing.T) {
 	regUser.Password = "nevergonnagiveyouup"
 	regUser.Value = validTXT
 
-	err = DB.Update(regUser.ACMETxtPost)
+	err = DB.Update(regUser.Challenge)
 	if err != nil {
 		t.Errorf("DB Update failed, got error: [%v]", err)
 	}
diff --git a/dns_test.go b/dns_test.go
index bd6877c..1067577 100644
--- a/dns_test.go
+++ b/dns_test.go
@@ -168,7 +168,7 @@ func TestResolveTXT(t *testing.T) {
 		return
 	}
 	atxt.Value = validTXT
-	err = DB.Update(atxt.ACMETxtPost)
+	err = DB.Update(atxt.Challenge)
 	if err != nil {
 		t.Errorf("Could not update db record: [%v]", err)
 		return
diff --git a/types.go b/types.go
index 7ad522c..25d5e2f 100644
--- a/types.go
+++ b/types.go
@@ -74,7 +74,7 @@ type database interface {
 	Register(cidrslice) (ACMETxt, error)
 	GetByUsername(uuid.UUID) (ACMETxt, error)
 	GetTXTForDomain(string) ([]string, error)
-	Update(ACMETxtPost) error
+	Update(Challenge) error
 	GetBackend() *sql.DB
 	SetBackend(*sql.DB)
 	Close()