Skip to content

Commit 7921f77

Browse files
authored
Simplify for loop with slices.Contains (#171)
1 parent 560d6f4 commit 7921f77

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

internal/hammer/loadtest/workers.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ import (
2424
"math/rand/v2"
2525
"time"
2626

27+
"slices"
28+
2729
"github.com/google/certificate-transparency-go/x509"
2830
"github.com/transparency-dev/formats/log"
2931
"github.com/transparency-dev/merkle/proof"
@@ -455,10 +457,5 @@ func entryFromChain(chain []*x509.Certificate, isPrecert bool, timestamp uint64)
455457
// certificate transparency extended key usage.
456458
// Copied from certificate-transparency-go/serialization.go and internal/scti/handlers.go.
457459
func isPreIssuer(issuer *x509.Certificate) bool {
458-
for _, eku := range issuer.ExtKeyUsage {
459-
if eku == x509.ExtKeyUsageCertificateTransparency {
460-
return true
461-
}
462-
}
463-
return false
460+
return slices.Contains(issuer.ExtKeyUsage, x509.ExtKeyUsageCertificateTransparency)
464461
}

internal/scti/handlers.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ import (
2828
"sync"
2929
"time"
3030

31+
"slices"
32+
3133
"github.com/google/certificate-transparency-go/tls"
3234
"github.com/google/certificate-transparency-go/x509"
3335
"github.com/prometheus/client_golang/prometheus"
@@ -510,10 +512,5 @@ func entryFromChain(chain []*x509.Certificate, isPrecert bool, timestamp uint64)
510512
// certificate transparency extended key usage.
511513
// copied form certificate-transparency-go/serialization.go
512514
func isPreIssuer(issuer *x509.Certificate) bool {
513-
for _, eku := range issuer.ExtKeyUsage {
514-
if eku == x509.ExtKeyUsageCertificateTransparency {
515-
return true
516-
}
517-
}
518-
return false
515+
return slices.Contains(issuer.ExtKeyUsage, x509.ExtKeyUsageCertificateTransparency)
519516
}

0 commit comments

Comments
 (0)