peatio-thought 2.6.3 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29d09e5977b9013ff270981b1546acfff59b7391d4a0c6bbfd5aa518fdbe66f5
-  data.tar.gz: db4378b445083e2ba33ff4a7d232708b9327259059789988d37c8bfa2eaa2a2a
+  metadata.gz: c2ac431dc42834213be104d8228405d166d6fbaed44de43a7c85d12e62e8cda7
+  data.tar.gz: d4dd5773e827047facbe616dcf4bf4002a2b5952301774a28dcc388590f27ec4
 SHA512:
-  metadata.gz: 561df470215fc6188a394b44be79e1a2d1c00123ba2f41513d089f27a946e8037c0b850af521bddf573f896f03e2312eb0efc987f426f1798fecfc7cc079642c
-  data.tar.gz: 78d72b04b95607f25b29a1e97e2fe39e0afd4feae4520f60d1cbf56de83f70d4d121bec2dfe5d7bab1301f064b403127cb3af236e0b8c37c9ce536cf920cc70c
+  metadata.gz: c24e9ee608e84c587d631f013ac747a752dc7814df856ff2b5f0838f9ca7878284f20b5113208beb3ff9daa063245409c4ccb209521dbcf3d5e960819c510318
+  data.tar.gz: 4d2f142b8cc002ca013c17194095ad80c1108e14e797edf76de3e46bad3de64bf9ef47a9acefabba558c0290d78ef93d290cdb8678ae80a740420b31f30a28ca

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    peatio-thought (2.6.3)
+    peatio-thought (2.6.5)
       activesupport (~> 5.2.3)
       better-faraday (~> 1.0.5)
       faraday (~> 0.17)

data/lib/peatio/thought/blockchain.rb

@@ -26,12 +26,11 @@ module Peatio
             Peatio::Transaction.new(ntx.merge(block_number: block_number))
           end
           txs_array.append(*txs)
-        end
+        end.yield_self { |txs_array| Peatio::Block.new(block_number, txs_array) }
+    rescue Client::Error => e
+      raise Peatio::Blockchain::ClientError, e
+    end
 
-        Peatio::Block.new(block_number, block_txs)
-      rescue Client::Error => e
-        raise Peatio::Blockchain::ClientError, e
-      end
 
       def latest_block_number
         client.json_rpc(:getblockcount)
@@ -44,32 +43,32 @@ module Peatio
                                      .flatten(1)
                                      .find {|addr| addr[0] == address }
 
-        raise Peatio::Blockchain::UnavailableAddressBalanceError, address if address_with_balance.blank?
-
-        address_with_balance[1].to_d
-      rescue Client::Error => e
-        raise Peatio::Blockchain::ClientError, e
+      if address_with_balance.blank?
+        raise Peatio::Blockchain::UnavailableAddressBalanceError, address
       end
 
-      private
+      address_with_balance[1].to_d
+    rescue Client::Error => e
+      raise Peatio::Blockchain::ClientError, e
+    end
+
+private
 
       def filter_vout(tx_hash)
         tx_hash.fetch("vout").select do |entry|
           entry.fetch("value").to_d.positive? && entry["scriptPubKey"].has_key?("addresses")
         end
-      end
-
-      def build_transaction(tx_hash)
-        filter_vout(tx_hash).each_with_object([]) do |entry, formatted_txs|
-          no_currency_tx = {hash: tx_hash["txid"], txout: entry["n"],
-                            to_address: entry["scriptPubKey"]["addresses"][0],
-                            amount: entry.fetch("value").to_d,
-                            status: "success"}
-
-          # Build transaction for each currency belonging to blockchain.
-          settings_fetch(:currencies).pluck(:id).each do |currency_id|
-            formatted_txs << no_currency_tx.merge(currency_id: currency_id)
-          end
+        .each_with_object([]) do |entry, formatted_txs|
+          no_currency_tx =
+            { hash: tx_hash['txid'], txout: entry['n'],
+              to_address: entry['scriptPubKey']['addresses'][0],
+              amount: entry.fetch('value').to_d,
+              status: 'success' }
+
+            # Build transaction for each currency belonging to blockchain.
+            settings_fetch(:currencies).pluck(:id).each do |currency_id|
+              formatted_txs << no_currency_tx.merge(currency_id: currency_id)
+            end
         end
       end
 
@@ -77,9 +76,10 @@ module Peatio
         @client ||= Client.new(settings_fetch(:server))
       end
 
-      def settings_fetch(key)
-        @settings.fetch(key) { raise Peatio::Blockchain::MissingSettingError, key.to_s }
-      end
+    def settings_fetch(key)
+      @settings.fetch(key) { raise Peatio::Blockchain::MissingSettingError, key.to_s }
     end
   end
+ end
 end
+

data/lib/peatio/thought/client.rb

@@ -8,57 +8,49 @@ module Peatio
   module Thought
     class Client
       Error = Class.new(StandardError)
-      ConnectionError = Class.new(Error)
+
+      class ConnectionError < Error; end
 
       class ResponseError < Error
         def initialize(code, msg)
-          @code = code
-          @msg = msg
-        end
-
-        def message
-          "#{@msg} (#{@code})"
-        end
+          super "#{msg} (#{code})"
       end
+    end
 
       extend Memoist
 
-      def initialize(endpoint)
-        @json_rpc_endpoint = URI.parse(endpoint)
-      end
-
-      def json_rpc(method, params=[])
-        response = post(method, params)
-
-        response.assert_2xx!
-        response = JSON.parse(response.body)
-
-        response["error"].tap do |e|
-          raise ResponseError.new(e["code"], e["message"]) if e
-        end
-
-        response.fetch("result")
-      rescue Faraday::Error => e
-        raise ConnectionError, e
-      end
+      def initialize(endpoint, idle_timeout: 5)
+      @json_rpc_endpoint = URI.parse(endpoint)
+      @idle_timeout = idle_timeout
+    end
 
-      private
+    def json_rpc(method, params = [])
+      response = connection.post \
+        '/',
+        {jsonrpc: '1.0', method: method, params: params}.to_json,
+        {'Accept' => 'application/json',
+         'Content-Type' => 'application/json'}
+      response.assert_success!
+      response = JSON.parse(response.body)
+      response['error'].tap { |error| raise ResponseError.new(error['code'], error['message']) if error }
+      response.fetch('result')
+    rescue Faraday::Error => e
+      raise ConnectionError, e
+    rescue StandardError => e
+      raise Error, e
+    end
 
-      def post(method, params)
-        connection.post("/", {jsonrpc: "1.0", method: method, params: params}.to_json,
-                        "Accept" => "application/json", "Content-Type" => "application/json")
-      end
+    private
 
-      def connection
-        @connection ||= Faraday.new(@json_rpc_endpoint) do |f|
-          f.adapter :net_http_persistent, pool_size: 5
-        end.tap do |connection|
-          unless @json_rpc_endpoint.user.blank?
-            connection.basic_auth(@json_rpc_endpoint.user,
-                                  @json_rpc_endpoint.password)
-          end
+    def connection
+      @connection ||= Faraday.new(@json_rpc_endpoint) do |f|
+        f.adapter :net_http_persistent, pool_size: 5, idle_timeout: @idle_timeout
+      end.tap do |connection|
+        unless @json_rpc_endpoint.user.blank?
+          connection.basic_auth(@json_rpc_endpoint.user, @json_rpc_endpoint.password)
         end
       end
     end
   end
 end
+end

data/lib/peatio/thought/version.rb

@@ -2,6 +2,6 @@
 
 module Peatio
   module Thought
-    VERSION = "2.6.3"
+    VERSION = "2.6.5"
   end
 end

data/lib/peatio/thought/wallet.rb

@@ -54,10 +54,10 @@ module Peatio
 
       private
 
-      def client
-        uri = @wallet.fetch(:uri) { raise Peatio::Wallet::MissingSettingError, :uri }
-        @client ||= Client.new(uri)
-      end
+    def client
+      uri = @wallet.fetch(:uri) { raise Peatio::Wallet::MissingSettingError, :uri }
+      @client ||= Client.new(uri, idle_timeout: 1)
     end
   end
 end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peatio-thought
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.5
 platform: ruby
 authors:
 - Andrew@Thought
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Peatio Thought Blockchain Plugin