From 2bf12b93e18deb3527b54386c6f7af74083bf641 Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Tue, 10 Mar 2020 16:40:46 -0700
Subject: [PATCH] Rename "authz2" types to just "authz" (#4701)

This cleans up after the authzv2 migration and makes names a little
easier to read, since there is no longer a v1/v2 distinction. This
leaves the names of tables the same since they would require a migration
to change.
---
 sa/database.go |  2 +-
 sa/model.go    |  7 +------
 sa/sa.go       | 10 +++++-----
 sa/sa_test.go  |  6 +++---
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/sa/database.go b/sa/database.go
index 8c8970f2a..5d43db458 100644
--- a/sa/database.go
+++ b/sa/database.go
@@ -136,7 +136,7 @@ func initTables(dbMap *gorp.DbMap) {
 	dbMap.AddTableWithName(requestedNameModel{}, "requestedNames").SetKeys(false, "OrderID")
 	dbMap.AddTableWithName(orderFQDNSet{}, "orderFqdnSets").SetKeys(true, "ID")
 	dbMap.AddTableWithName(authzModel{}, "authz2").SetKeys(true, "ID")
-	dbMap.AddTableWithName(orderToAuthz2Model{}, "orderToAuthz2").SetKeys(false, "OrderID", "AuthzID")
+	dbMap.AddTableWithName(orderToAuthzModel{}, "orderToAuthz2").SetKeys(false, "OrderID", "AuthzID")
 	dbMap.AddTableWithName(recordedSerialModel{}, "serials").SetKeys(true, "ID")
 	dbMap.AddTableWithName(precertificateModel{}, "precertificates").SetKeys(true, "ID")
 }
diff --git a/sa/model.go b/sa/model.go
index 9a79c744b..4a8376e03 100644
--- a/sa/model.go
+++ b/sa/model.go
@@ -350,11 +350,6 @@ type requestedNameModel struct {
 }
 
 type orderToAuthzModel struct {
-	OrderID int64
-	AuthzID string
-}
-
-type orderToAuthz2Model struct {
 	OrderID int64
 	AuthzID int64
 }
@@ -449,7 +444,7 @@ func statusUint(status core.AcmeStatus) uint8 {
 	return statusToUint[string(status)]
 }
 
-const authz2Fields = "id, identifierType, identifierValue, registrationID, status, expires, challenges, attempted, token, validationError, validationRecord"
+const authzFields = "id, identifierType, identifierValue, registrationID, status, expires, challenges, attempted, token, validationError, validationRecord"
 
 type authzModel struct {
 	ID               int64     `db:"id"`
diff --git a/sa/sa.go b/sa/sa.go
index 36120acf6..50ce59b90 100644
--- a/sa/sa.go
+++ b/sa/sa.go
@@ -903,7 +903,7 @@ func (ssa *SQLStorageAuthority) NewOrder(ctx context.Context, req *corepb.Order)
 		}
 
 		for _, id := range req.V2Authorizations {
-			otoa := &orderToAuthz2Model{
+			otoa := &orderToAuthzModel{
 				OrderID: order.ID,
 				AuthzID: id,
 			}
@@ -1443,7 +1443,7 @@ func (ssa *SQLStorageAuthority) GetAuthorizations2(ctx context.Context, req *sap
 			expires > ? AND
 			identifierType = ? AND
 			identifierValue IN (%s)`,
-		authz2Fields,
+		authzFields,
 		strings.Join(qmarks, ","),
 	)
 	_, err := ssa.dbMap.Select(
@@ -1624,7 +1624,7 @@ func (ssa *SQLStorageAuthority) GetPendingAuthorization2(ctx context.Context, re
 			identifierType = :dnsType AND
 			identifierValue = :ident
 			ORDER BY expires ASC
-			LIMIT 1 `, authz2Fields),
+			LIMIT 1 `, authzFields),
 		map[string]interface{}{
 			"regID":      *req.RegistrationID,
 			"status":     statusUint(core.StatusPending),
@@ -1676,7 +1676,7 @@ func (ssa *SQLStorageAuthority) GetValidOrderAuthorizations2(ctx context.Context
 			authz2.expires > :expires AND
 			authz2.status = :status AND
 			orderToAuthz2.orderID = :orderID`,
-			authz2Fields,
+			authzFields,
 		),
 		map[string]interface{}{
 			"regID":   *req.AcctID,
@@ -1758,7 +1758,7 @@ func (ssa *SQLStorageAuthority) GetValidAuthorizations2(ctx context.Context, req
 			expires > ? AND
 			identifierType = ? AND
 			identifierValue IN (%s)`,
-			authz2Fields,
+			authzFields,
 			strings.Join(qmarks, ","),
 		),
 		params...,
diff --git a/sa/sa_test.go b/sa/sa_test.go
index 6077ebef5..bf7e3bf16 100644
--- a/sa/sa_test.go
+++ b/sa/sa_test.go
@@ -1140,17 +1140,17 @@ func TestGetAuthorizations2(t *testing.T) {
 
 	// Associate authorizations with an order so that GetAuthorizations2 thinks
 	// they are WFE2 authorizations.
-	err := sa.dbMap.Insert(&orderToAuthz2Model{
+	err := sa.dbMap.Insert(&orderToAuthzModel{
 		OrderID: 1,
 		AuthzID: authzIDA,
 	})
 	test.AssertNotError(t, err, "sa.dbMap.Insert failed")
-	err = sa.dbMap.Insert(&orderToAuthz2Model{
+	err = sa.dbMap.Insert(&orderToAuthzModel{
 		OrderID: 1,
 		AuthzID: authzIDB,
 	})
 	test.AssertNotError(t, err, "sa.dbMap.Insert failed")
-	err = sa.dbMap.Insert(&orderToAuthz2Model{
+	err = sa.dbMap.Insert(&orderToAuthzModel{
 		OrderID: 1,
 		AuthzID: authzIDC,
 	})