Fix some rubocop offences

Author: comandeo-mongo

lib/mongo/retryable/backpressure.rb

@@ -30,7 +30,7 @@ module Backpressure
       #
       # @return [ Float ] The backoff delay in seconds.
       def self.backoff_delay(attempt, jitter: rand)
-        jitter * [MAX_BACKOFF, BASE_BACKOFF * (2**(attempt - 1))].min
+        jitter * [ MAX_BACKOFF, BASE_BACKOFF * (2**(attempt - 1)) ].min
       end
     end
   end

lib/mongo/retryable/retry_policy.rb

@@ -48,15 +48,13 @@ def backoff_delay(attempt, jitter: rand)
       def should_retry_overload?(attempt, delay, context: nil)
         return false if attempt > Backpressure::MAX_RETRIES
 
-        if context&.csot? && context&.deadline
-          return false if context.deadline.nonzero? &&
-            Utils.monotonic_time + delay > context.deadline
-        end
-
-        if @token_bucket && !@token_bucket.consume(1)
+        if context&.csot? && context&.deadline && (context.deadline.nonzero? &&
+                          Utils.monotonic_time + delay > context.deadline)
           return false
         end
 
+        return false if @token_bucket && !@token_bucket.consume(1)
+
         true
       end
 

lib/mongo/retryable/token_bucket.rb

@@ -51,7 +51,7 @@ def consume(n = 1)
       # @return [ Float ] The new token count.
       def deposit(n)
         @mutex.synchronize do
-          @tokens = [@capacity, @tokens + n].min
+          @tokens = [ @capacity, @tokens + n ].min
         end
       end
     end

spec/mongo/retryable/adaptive_retries_option_spec.rb

@@ -5,17 +5,17 @@
 describe 'adaptiveRetries option' do
   describe 'client option' do
     it 'defaults to nil (not set)' do
-      client = new_local_client_nmio(['localhost:27017'])
+      client = new_local_client_nmio([ 'localhost:27017' ])
       expect(client.options[:adaptive_retries]).to be_nil
     end
 
     it 'can be set to true' do
-      client = new_local_client_nmio(['localhost:27017'], adaptive_retries: true)
+      client = new_local_client_nmio([ 'localhost:27017' ], adaptive_retries: true)
       expect(client.options[:adaptive_retries]).to be true
     end
 
     it 'can be set to false' do
-      client = new_local_client_nmio(['localhost:27017'], adaptive_retries: false)
+      client = new_local_client_nmio([ 'localhost:27017' ], adaptive_retries: false)
       expect(client.options[:adaptive_retries]).to be false
     end
   end

spec/mongo/retryable/overload_error_helpers_spec.rb

@@ -30,7 +30,7 @@
       let(:error) { Mongo::Error::SocketError.new('test') }
 
       it 'returns false' do
-        expect(worker.overload_error?(error)).to be_falsey
+        expect(worker).not_to be_overload_error(error)
       end
     end
 
@@ -85,7 +85,7 @@
       let(:error) { Mongo::Error::SocketError.new('test') }
 
       it 'returns false' do
-        expect(worker.retryable_overload_error?(error)).to be_falsey
+        expect(worker).not_to be_retryable_overload_error(error)
       end
     end
   end

spec/mongo/retryable/read_worker_overload_spec.rb

@@ -3,6 +3,8 @@
 require 'lite_spec_helper'
 
 describe Mongo::Retryable::ReadWorker do
+  subject(:worker) { described_class.new(retryable) }
+
   let(:retry_policy) { Mongo::Retryable::RetryPolicy.new }
 
   let(:client) do
@@ -33,8 +35,6 @@
     end
   end
 
-  subject(:worker) { described_class.new(retryable) }
-
   before do
     allow(worker).to receive(:sleep)
   end
@@ -64,6 +64,7 @@ def make_retryable_error(message = 'not master')
         result = worker.read_with_retry(session, server_selector, context) do |_server, _is_retry|
           call_count += 1
           raise make_overload_error if call_count <= 3
+
           :success
         end
 
@@ -97,6 +98,7 @@ def make_retryable_error(message = 'not master')
         result = worker.read_with_retry(session, server_selector, context) do |_server, _is_retry|
           call_count += 1
           raise make_retryable_error if call_count == 1
+
           :success
         end
 
@@ -139,6 +141,7 @@ def make_retryable_error(message = 'not master')
         worker.read_with_retry(session, server_selector, context) do |_server, _is_retry|
           call_count += 1
           raise make_overload_error if call_count == 1
+
           :ok
         end
       end

spec/mongo/retryable/write_worker_overload_spec.rb

@@ -281,9 +281,7 @@ def make_retryable_write_error(message = 'not master')
           context: context, failed_server: server, error_count: 1
         ) do |_conn, _txn, _ctx|
           call_count += 1
-          if call_count == 1
-            raise make_retryable_write_error
-          end
+          raise make_retryable_write_error if call_count == 1
 
           :recovered
         end

spec/mongo/session/with_transaction_overload_spec.rb

@@ -18,7 +18,7 @@
     let(:session) do
       # Build a minimal session-like object that has the methods we need.
       # We use allocate + manual setup to avoid needing a real server connection.
-      sess = Mongo::Session.allocate
+      sess = described_class.allocate
 
       # Set the instance variables that with_transaction depends on.
       sess.instance_variable_set(:@client, client)
@@ -77,7 +77,7 @@ def make_commit_transient_overload_error
       end
 
       # Use deterministic jitter for backoff_delay
-      allow(retry_policy).to receive(:backoff_delay).and_wrap_original do |method, attempt, **kwargs|
+      allow(retry_policy).to receive(:backoff_delay).and_wrap_original do |method, attempt, **_kwargs|
         method.call(attempt, jitter: 1.0)
       end
 
@@ -168,9 +168,8 @@ def make_commit_transient_overload_error
 
         allow(session).to receive(:commit_transaction) do
           commit_count += 1
-          if commit_count == 1
-            raise commit_error
-          end
+          raise commit_error if commit_count == 1
+
           session.instance_variable_set(:@state, Mongo::Session::TRANSACTION_COMMITTED_STATE)
         end