Fix merge conflicts

Author: jsha

va/va_test.go

@@ -144,13 +144,8 @@ func setup(srv *httptest.Server, userAgent string, remoteVAs []RemoteVA, mockDNS
 	return va, logger
 }
 
-<<<<<<< HEAD
-func setupRemote(srv *httptest.Server, userAgent string, mockDNSClientOverride bdns.Client, perspective, rir string) (RemoteClients, *blog.Mock) {
-	rva, log := setup(srv, userAgent, nil, mockDNSClientOverride)
-=======
 func setupRemote(srv *httptest.Server, userAgent string, mockDNSClientOverride bdns.Client, perspective, rir string) RemoteClients {
-	rva, _ := setup(srv, 0, userAgent, nil, mockDNSClientOverride)
->>>>>>> 2502113ac38a36d1b5a7729f3cee58bf359dab4d
+	rva, _ := setup(srv, userAgent, nil, mockDNSClientOverride)
 	rva.perspective = perspective
 	rva.rir = rir
 
@@ -375,14 +370,9 @@ func TestMultiVA(t *testing.T) {
 	ms := httpMultiSrv(t, expectedToken, allowedUAs)
 	defer ms.Close()
 
-<<<<<<< HEAD
-	remoteVA1, _ := setupRemote(ms.Server, remoteUA1, nil, "", "")
-	remoteVA2, _ := setupRemote(ms.Server, remoteUA2, nil, "", "")
-	remoteVA3, _ := setupRemote(ms.Server, remoteUA3, nil, "", "")
-=======
 	remoteVA1 := setupRemote(ms.Server, remoteUA1, nil, "", "")
 	remoteVA2 := setupRemote(ms.Server, remoteUA2, nil, "", "")
->>>>>>> 2502113ac38a36d1b5a7729f3cee58bf359dab4d
+	remoteVA3 := setupRemote(ms.Server, remoteUA3, nil, "", "")
 	remoteVAs := []RemoteVA{
 		{remoteVA1, remoteUA1},
 		{remoteVA2, remoteUA2},
@@ -543,14 +533,9 @@ func TestMultiVAEarlyReturn(t *testing.T) {
 	ms := httpMultiSrv(t, expectedToken, allowedUAs)
 	defer ms.Close()
 
-<<<<<<< HEAD
-	remoteVA1, _ := setupRemote(ms.Server, remoteUA1, nil, "", "")
-	remoteVA2, _ := setupRemote(ms.Server, remoteUA2, nil, "", "")
-	remoteVA3, _ := setupRemote(ms.Server, remoteUA3, nil, "", "")
-=======
 	remoteVA1 := setupRemote(ms.Server, remoteUA1, nil, "", "")
 	remoteVA2 := setupRemote(ms.Server, remoteUA2, nil, "", "")
->>>>>>> 2502113ac38a36d1b5a7729f3cee58bf359dab4d
+	remoteVA3 := setupRemote(ms.Server, remoteUA3, nil, "", "")
 
 	remoteVAs := []RemoteVA{
 		{remoteVA1, remoteUA1},
@@ -698,16 +683,10 @@ func TestDetailedError(t *testing.T) {
 
 func TestLogRemoteDifferentials(t *testing.T) {
 	// Create some remote VAs
-<<<<<<< HEAD
-	remoteVA1, _ := setupRemote(nil, "remote 1", nil, "", "")
-	remoteVA2, _ := setupRemote(nil, "remote 2", nil, "", "")
-	remoteVA3, _ := setupRemote(nil, "remote 3", nil, "", "")
-	// The VA will allow a max of 1 remote failure based on MPIC.
-=======
 	remoteVA1 := setupRemote(nil, "remote 1", nil, "", "")
 	remoteVA2 := setupRemote(nil, "remote 2", nil, "", "")
 	remoteVA3 := setupRemote(nil, "remote 3", nil, "", "")
->>>>>>> 2502113ac38a36d1b5a7729f3cee58bf359dab4d
+	// The VA will allow a max of 1 remote failure based on MPIC.
 	remoteVAs := []RemoteVA{
 		{remoteVA1, "remote 1"},
 		{remoteVA2, "remote 2"},