Addressing comments

Author: beautifulentropy

ratelimits/limiter_test.go

@@ -59,7 +59,7 @@ func setup(t *testing.T) (context.Context, map[string]*Limiter, *TransactionBuil
 	}, newTestTransactionBuilder(t), clk, randIP.String()
 }
 
-func mustReset(t *testing.T, l *Limiter, ctx context.Context, limit *Limit, bucketKey string) {
+func resetBucket(t *testing.T, l *Limiter, ctx context.Context, limit *Limit, bucketKey string) {
 	t.Helper()
 	txn, err := newResetTransaction(limit, bucketKey)
 	test.AssertNotError(t, err, "txn should be valid")
@@ -161,8 +161,8 @@ func TestLimiter_CheckWithLimitOverrides(t *testing.T) {
 			test.AssertEquals(t, d.resetIn, time.Millisecond*50)
 
 			// Reset between tests.
-			mustReset(t, l, testCtx, overriddenLimit, overriddenBucketKey)
-			mustReset(t, l, testCtx, normalLimit, normalBucketKey)
+			resetBucket(t, l, testCtx, overriddenLimit, overriddenBucketKey)
+			resetBucket(t, l, testCtx, normalLimit, normalBucketKey)
 
 			// Spend the same bucket but in a batch with a Transaction that is
 			// check-only. This should succeed, but the decision should reflect
@@ -244,7 +244,7 @@ func TestLimiter_CheckWithLimitOverrides(t *testing.T) {
 			test.AssertEquals(t, d.resetIn, time.Millisecond*50)
 
 			// Reset between tests.
-			mustReset(t, l, testCtx, overriddenLimit, overriddenBucketKey)
+			resetBucket(t, l, testCtx, overriddenLimit, overriddenBucketKey)
 		})
 	}
 }
@@ -283,7 +283,7 @@ func TestLimiter_InitializationViaCheckAndSpend(t *testing.T) {
 			test.AssertEquals(t, d.retryIn, time.Duration(0))
 
 			// Reset our bucket.
-			mustReset(t, l, testCtx, limit, bucketKey)
+			resetBucket(t, l, testCtx, limit, bucketKey)
 
 			// Similar to above, but we'll use Spend() to actually initialize
 			// the bucket. Spend should return the same result as Check.
@@ -404,7 +404,7 @@ func TestLimiter_RefundAndReset(t *testing.T) {
 			test.AssertEquals(t, d.remaining, int64(0))
 			test.AssertEquals(t, d.resetIn, time.Second)
 
-			mustReset(t, l, testCtx, limit, bucketKey)
+			resetBucket(t, l, testCtx, limit, bucketKey)
 
 			// Attempt to spend 20 more requests, this should succeed.
 			d, err = l.Spend(testCtx, txn20)

ratelimits/source_redis.go

@@ -242,12 +242,6 @@ func (r *RedisSource) BatchDelete(ctx context.Context, bucketKeys []string) erro
 	return nil
 }
 
-// Delete deletes the TAT at the specified bucketKey ('name:id'). A nil return
-// value does not indicate that the bucketKey existed.
-func (r *RedisSource) Delete(ctx context.Context, bucketKey string) error {
-	return r.BatchDelete(ctx, []string{bucketKey})
-}
-
 // Ping checks that each shard of the *redis.Ring is reachable using the PING
 // command.
 func (r *RedisSource) Ping(ctx context.Context) error {

ratelimits/transaction.go

@@ -76,10 +76,10 @@ func newFQDNSetBucketKey(name Name, orderIdents identifier.ACMEIdentifiers) stri
 //     bucket's capacity, but will never be spent/refunded.
 //   - spend-only: when only spend is true, spending is best-effort. Regardless
 //     of the bucket's capacity, the transaction will be considered "allowed".
+//   - reset-only: when reset is true, the bucket will be reset to full capacity.
 //   - allow-only: when neither check nor spend are true, the transaction will
 //     be considered "allowed" regardless of the bucket's capacity. This is
 //     useful for limits that are disabled.
-//   - reset: when reset is true, the bucket will be reset to full capacity.
 //
 // The zero value of Transaction is an allow-only transaction and is valid even if
 // it would fail validateTransaction (for instance because cost and burst are zero).