zold 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73513e03f0456f1f174a5fbda8880d05ad26b4e6
-  data.tar.gz: 0c5fa14573661f65ddba4dbfa65afdc1e010c60d
+  metadata.gz: 6c22d25b0575aa403b58457dc738b232a14e40c8
+  data.tar.gz: 40726c037b816bd370b41b2cd46c1dfd23d834d7
 SHA512:
-  metadata.gz: 181d60dd63b4fdc24d88f5af921f76dcd8e0b39f9f8b49103dc36d10d7f7c0da4d44ac52ac19206b5811ebb77e6eddae88509be19c62cd781928532f68c981bc
-  data.tar.gz: 1e06c4d01f5dc12a52b6ebe9c475de20555ee376aa9395d991b57f17b8f466553dab66142b99b38128cf04d33cb27514deaadb25faf771af9604437dbc84b40c
+  metadata.gz: cdbfb12a088dbfc45ea613d5274c7bf1baf64d1864f939264bdd832cceb0c41988ba003fd27b3819a55a71ed4a599c847f65b676cc8e1052a6e27431cd053aa7
+  data.tar.gz: 2ea2de44216e0ef5f69f27b1c065fd2ec4570c0488a76d567572403cb284a72e72a872cccc4906e2528fc211e400143c9e04e94d973882be4d7c30a4223c3c67

data/lib/zold/commands/fetch.rb

@@ -21,6 +21,7 @@
 require 'uri'
 require 'json'
 require 'time'
+require 'tempfile'
 require 'slop'
 require 'rainbow'
 require_relative 'args'
@@ -86,9 +87,14 @@ Available options:"
       score = Score.parse_json(json['score'])
       r.assert_valid_score(score)
       raise "Score is too weak #{score.strength}" if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
-      cps.add(json['body'], score.host, score.port, score.value)
-      @log.info("#{r} returned #{json['body'].length}b/#{Rainbow(score.value).green} \
-of #{id} (#{json['version']}) in #{(Time.now - start).round(2)}s")
+      Tempfile.open do |f|
+        body = json['body']
+        File.write(f, body)
+        wallet = Wallet.new(f.path)
+        cps.add(body, score.host, score.port, score.value)
+        @log.info("#{r} returned #{body.length}b/#{wallet.txns.count} \
+of #{id} in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green} (#{json['version']})")
+      end
     end
   end
 end

data/lib/zold/commands/push.rb

@@ -77,9 +77,8 @@ Available options:"
         return 0
       end
       start = Time.now
-      response = r.http(
-        "/wallet/#{wallet.id}#{opts['sync'] ? '?sync=true' : ''}"
-      ).put(File.read(wallet.path))
+      content = File.read(wallet.path)
+      response = r.http("/wallet/#{wallet.id}#{opts['sync'] ? '?sync=true' : ''}").put(content)
       if response.code == '304'
         @log.info("#{r}: same version of #{wallet.id} there")
         return 0
@@ -89,7 +88,8 @@ Available options:"
       score = Score.parse_json(json)
       r.assert_valid_score(score)
       raise "Score is too weak #{score}" if score.strength < Score::STRENGTH
-      @log.info("#{r} accepted #{wallet.id} in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green}")
+      @log.info("#{r} accepted #{content.length}b/#{wallet.txns.count}txns of #{wallet.id} \
+in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green} (#{json['version']})")
       score.value
     end
   end

data/lib/zold/node/front.rb

@@ -108,6 +108,7 @@ module Zold
         pid: Process.pid,
         cpus: Concurrent.processor_count,
         uptime: `uptime`.strip,
+        threads: Thread.list.select { |t| t.status == 'run' }.count,
         wallets: settings.wallets.all.count,
         remotes: settings.remotes.all.count,
         farm: settings.farm.to_json,

data/lib/zold/remotes.rb

@@ -47,10 +47,11 @@ module Zold
     # One remote.
     class Remote
       attr_reader :host, :port
-      def initialize(host, port, score)
+      def initialize(host, port, score, log: Log::Quiet.new)
         @host = host
         @port = port
         @score = score
+        @log = log
       end
 
       def http(path = '/')
@@ -63,7 +64,11 @@ module Zold
       end
 
       def assert_code(code, response)
-        raise "#{response.code} \"#{response.message}\" at \"#{response.body}\"" unless response.code.to_i == code
+        @log.debug("#{response.code} \"#{response.message}\" at \"#{response.body}\"")
+        msg = response.message
+        return if response.code.to_i == code
+        raise "Unexpected HTTP code #{response.code}, instead of #{code}" if msg.empty?
+        raise "#{msg} (HTTP code #{response.code}, instead of #{code})"
       end
 
       def assert_valid_score(score)
@@ -129,7 +134,7 @@ module Zold
       score = best.nil? ? Score::ZERO : best
       all.each do |r|
         begin
-          yield Remotes::Remote.new(r[:host], r[:port], score)
+          yield Remotes::Remote.new(r[:host], r[:port], score, log: log)
         rescue StandardError => e
           error(r[:host], r[:port])
           log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message}")

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.11.4'.freeze
+  VERSION = '0.11.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Yegor Bugayenko