Cosmetic code changes

Signed-off-by: Diogo Monica <diogo@docker.com>

trustmanager/x509filestore_test.go

@@ -164,7 +164,7 @@ func TestRemoveAllX509FileStore(t *testing.T) {
 		}
 	}
 
-	// Number of certificates should be 1 since we added the cert
+	// Number of certificates should be 3 since we added the cert
 	numCerts := len(store.GetCertificates())
 	if numCerts != 3 {
 		t.Fatalf("unexpected number of certificates in store: %d", numCerts)

trustmanager/x509memstore.go

@@ -98,9 +98,6 @@ func (s *X509MemStore) RemoveAll() error {
 		}
 	}
 
-	s.fingerprintMap = make(map[CertID]*x509.Certificate)
-	s.nameMap = make(map[string][]CertID)
-
 	return nil
 }
 

trustmanager/x509memstore_test.go

@@ -130,7 +130,7 @@ func TestRemoveAllX509MemStore(t *testing.T) {
 		}
 	}
 
-	// Number of certificates should be 1 since we added the cert
+	// Number of certificates should be 3 since we added the cert
 	numCerts := len(store.GetCertificates())
 	if numCerts != 3 {
 		t.Fatalf("unexpected number of certificates in store: %d", numCerts)

trustmanager/x509store.go

@@ -35,7 +35,7 @@ func (err ErrCertValidation) Error() string {
 type ErrCertExists struct {
 }
 
-// ErrInvalidCertificate is returned when an invalid Certificate is given
+// ErrCertExists is returned when a Certificate already exists in the key store
 func (err ErrCertExists) Error() string {
 	return fmt.Sprintf("certificate already in the store")
 }