DigixGlobal#70 rubocop -a

bshevchenko · Sep 4, 2019 · 5fe0550 · 5fe0550
1 parent 5b144d3
commit 5fe0550
Show file tree

Hide file tree

Showing 4 changed files with 220 additions and 220 deletions.
diff --git a/Gemfile b/Gemfile
@@ -100,7 +100,7 @@ end
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
 
 gem 'eth'
-gem 'web3-eth'
 gem 'newrelic_rpm'
+gem 'web3-eth'
 
 gem 'sanitize', '~> 5.0'
diff --git a/app/graphql/mutations/resend_transaction_mutation.rb b/app/graphql/mutations/resend_transaction_mutation.rb
@@ -58,7 +58,7 @@ def resolve(id:, transaction_object:, signed_transaction:)
         model_result(key, tx_or_errors)
       end
     rescue ActiveRecord::RecordNotFound
-      return form_error(key, 'transaction_object', 'Previous transaction not found')
+      form_error(key, 'transaction_object', 'Previous transaction not found')
     end
 
     def self.authorized?(object, context)

diff --git a/app/models/watching_transaction.rb b/app/models/watching_transaction.rb
@@ -14,9 +14,7 @@ class WatchingTransaction < ApplicationRecord
   def set_uuid
     self.id = SecureRandom.uuid
 
-    unless self.group_id
-      self.group_id = self.id
-    end
+    self.group_id = id unless group_id
   end
 
   def txhash=(value)
@@ -65,7 +63,7 @@ def resend # For 5 minute cron job
           end
         end
 
-        if data['blockNumber'] != nil
+        unless data['blockNumber'].nil?
           WatchingTransaction.find_by(group_id: tx.group_id).destroy
         end
       end