zold 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d3e4b50eba2938f33f62b40e1a052b736ccdca
-  data.tar.gz: 0d6fd2c89c0673606235a7eb99522cc8d886188d
+  metadata.gz: cc808990a7aeb6946114017c4754f6534493faab
+  data.tar.gz: 4c8f152bc663c64613fb864c0900977a60a613b6
 SHA512:
-  metadata.gz: 1def9d8e89cd27ddac2e2692585887013bcfaefc99db4fea123c2b53446099f897f35803b9a3d8325185881dc741b86b73dfe8f345e8df8b989802edac8bce8a
-  data.tar.gz: e91315346ae30f7c0946b66dd7d428f3557ff233268868b1e7b5b5ddd5ba16ed441cca192c1a8105ad5bd4006c13f5255412f215b82e7c13d9c288425f3248c9
+  metadata.gz: 1783a36f812fa552685868137567afbc671a1e8c27eef28e4b0421075872c3425c104b4c1defbc9107c095054b1dde86e9807b9c6ab33b927936dfaef32a60c7
+  data.tar.gz: 4f423df3b48d43f2018678c511139cbc2e6fb109508739f345cebf84c4ce71d7628982d04a8923a13e0416eae23095fc24ac17da3fbc9f71f39184b69ad32cff

data/Procfile

@@ -1 +1 @@
-web: LC_ALL=UTF-8 ./bin/zold node --no-colors --verbose --trace --bind-port=$PORT --port=80 --host=b1.zold.io --threads=1 --invoice=JKFq17yipfjLtX@0000000000000000 --never-reboot
+web: LC_ALL=UTF-8 ./bin/zold node --no-colors --verbose --trace --bind-port=$PORT --port=80 --host=b1.zold.io --threads=0 --invoice=JKFq17yipfjLtX@0000000000000000 --never-reboot

data/lib/zold/commands/fetch.rb

@@ -72,20 +72,21 @@ Available options:"
     end
 
     def fetch_one(id, r, cps, opts)
+      start = Time.now
       if opts['ignore-node'].include?(r.to_s)
         @log.info("#{r} ignored because of --ignore-node")
         return false
       end
       res = r.http("/wallet/#{id}").get
       raise "Wallet #{id} not found" if res.code == '404'
-      raise "#{res.code} \"#{res.message}\"" unless res.code == '200'
+      r.assert_code(200, res)
       json = JSON.parse(res.body)
       score = Score.parse_json(json['score'])
-      raise "Invalid score #{score}" unless score.valid?
-      raise "Score expired #{score}" if score.expired?
+      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} #{json['body'].length}b/#{Rainbow(score.value).green} (#{json['version']})")
+      @log.info("#{r} #{json['body'].length}b/#{Rainbow(score.value).green} (#{json['version']}) \
+in #{(Time.now - start).round(2)}s")
     end
   end
 end

data/lib/zold/commands/merge.rb

@@ -63,9 +63,19 @@ Available options:"
       raise 'There are no remote copies, try FETCH first' if cps.all.empty?
       cps = cps.all.sort_by { |c| c[:score] }.reverse
       patch = Patch.new
-      patch.start(Wallet.new(cps[0][:path]))
+      main = Wallet.new(cps[0][:path])
+      patch.start(main)
       cps[1..-1].each do |c|
-        patch.join(Wallet.new(c[:path]))
+        extra = Wallet.new(c[:path])
+        if extra.network != main.network
+          @log.error("The wallet is from a different network '#{wallet.version}', ours is '#{@network}'")
+          next
+        end
+        if extra.key != main.key
+          @log.error('Public key mismatch')
+          next
+        end
+        patch.join(extra)
       end
       modified = patch.save(wallet.path, overwrite: true)
       if modified

data/lib/zold/commands/push.rb

@@ -58,18 +58,18 @@ Available options:"
     def push(wallet, _)
       total = 0
       @remotes.iterate(@log) do |r|
+        start = Time.now
         response = r.http("/wallet/#{wallet.id}").put(File.read(wallet.path))
         if response.code == '304'
           @log.info("#{r}: same version there")
           next
         end
-        raise "#{response.code} \"#{response.message}\" at #{response.body}" unless response.code == '200'
+        r.assert_code(200, response)
         json = JSON.parse(response.body)['score']
         score = Score.parse_json(json)
-        raise "Invalid score #{score}" unless score.valid?
-        raise "Expired score #{score}" if score.expired?
+        r.assert_valid_score(score)
         raise "Score is too weak #{score}" if score.strength < Score::STRENGTH
-        @log.info("#{r} accepted: #{Rainbow(score.value).green}")
+        @log.info("#{r} accepted in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green}")
         total += score.value
       end
       @log.info("Total score is #{total}")

data/lib/zold/commands/remote.rb

@@ -116,12 +116,12 @@ Available options:"
     def update(opts, deep = true)
       capacity = []
       @remotes.iterate(@log) do |r|
+        start = Time.now
         res = r.http('/remotes').get
-        raise "#{res.code} \"#{res.message}\"" unless res.code == '200'
+        r.assert_code(200, res)
         json = JSON.parse(res.body)
         score = Score.parse_json(json['score'])
-        raise "Invalid score #{score}" unless score.valid?
-        raise "Expired score #{score}" if score.expired?
+        r.assert_valid_score(score)
         raise "Score too weak: #{score.strength}" if score.strength < Score::STRENGTH && !opts['ignore-score-weakness']
         raise "Masqueraded as #{score.host}:#{score.port}" if r.host != score.host || r.port != score.port
         @remotes.rescore(score.host, score.port, score.value)
@@ -131,7 +131,7 @@ Available options:"
           end
         end
         capacity << { host: score.host, port: score.port, count: json['all'].count }
-        @log.info("#{r}: #{Rainbow(score.value).green} (#{json['version']})")
+        @log.info("#{r}: #{Rainbow(score.value).green} (#{json['version']}) in #{(Time.now - start).round(2)}")
       end
       max_capacity = capacity.map { |c| c[:count] }.max || 0
       capacity.each do |c|

data/lib/zold/commands/taxes.rb

@@ -119,14 +119,13 @@ Available options:"
       best = []
       @remotes.iterate(@log) do |r|
         res = r.http.get
-        raise "#{res.code} \"#{res.message}\" at #{res.body}" unless res.code == '200'
+        r.assert_code(200, res)
         json = JSON.parse(res.body)
         score = Score.parse_json(json['score'])
-        raise "Invalid score #{score}" unless score.valid?
-        raise "Expired score #{score}" if score.expired?
+        r.assert_valid_score(score)
         raise "Score is too weak (<#{Score::STRENGTH}) #{score}" if score.strength < Score::STRENGTH
         raise "Score is too small (<#{Tax::EXACT_SCORE})" if score.value < Tax::EXACT_SCORE
-        @log.info("#{score.host}:#{score.port}: #{Rainbow(score.value).green}")
+        @log.info("#{r}: #{Rainbow(score.value).green}")
         best << score
       end
       best.sort_by(&:value).reverse

data/lib/zold/http.rb

@@ -50,7 +50,7 @@ module Zold
       http.read_timeout = 5
       return http.request_get(@uri.path, headers)
     rescue StandardError => e
-      return Net::HTTPServerError.new('1.1', '599', e.message)
+      Error.new(e)
     end
 
     def put(body)
@@ -64,11 +64,30 @@ module Zold
         )
       )
     rescue StandardError => e
-      return Net::HTTPServerError.new('1.1', '599', e.message)
+      Error.new(e)
     end
 
     private
 
+    # The error, if connection fails
+    class Error
+      def initialize(ex)
+        @ex = ex
+      end
+
+      def body
+        @ex.message + "\n" + @ex.backtrace.join("\n\t")
+      end
+
+      def code
+        '599'
+      end
+
+      def message
+        @ex.message
+      end
+    end
+
     def headers
       headers = {
         'User-Agent': "Zold #{VERSION}",

data/lib/zold/key.rb

@@ -48,6 +48,10 @@ module Zold
       end
     end
 
+    def ==(other)
+      to_s == other.to_s
+    end
+
     def to_s
       rsa.to_s.strip
     end

data/lib/zold/patch.rb

@@ -37,9 +37,6 @@ module Zold
     end
 
     def join(wallet)
-      if wallet.network != @network
-        raise "The wallet is from a different network '#{wallet.version}', ours is '#{@network}'"
-      end
       negative = @txns.select { |t| t.amount.negative? }
       max = negative.empty? ? 0 : negative.max_by(&:id).id
       wallet.txns.each do |txn|

data/lib/zold/remotes.rb

@@ -61,6 +61,15 @@ module Zold
       def to_s
         "#{@host}:#{@port}"
       end
+
+      def assert_code(code, response)
+        raise "#{response.code} \"#{response.message}\" at \"#{response.body}\"" unless response.code.to_i == code
+      end
+
+      def assert_valid_score(score)
+        raise "Invalid score #{score}" unless score.valid?
+        raise "Expired score #{score}" if score.expired?
+      end
     end
 
     def initialize(file, farm = Farm::Empty.new)

data/lib/zold/version.rb

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

data/test/test_http.rb

@@ -31,7 +31,16 @@ require_relative '../lib/zold/http'
 class TestHttp < Minitest::Test
   def test_pings_broken_uri
     stub_request(:get, 'http://bad-host/').to_return(status: 500)
-    assert_equal('500', Zold::Http.new(URI('http://bad-host/')).get.code)
+    res = Zold::Http.new(URI('http://bad-host/')).get
+    assert_equal('500', res.code)
+    assert_equal('', res.body)
+  end
+
+  def test_pings_with_exception
+    stub_request(:get, 'http://exception/').to_return { raise 'Intentionally' }
+    res = Zold::Http.new(URI('http://exception/')).get
+    assert_equal('599', res.code)
+    assert(res.body.include?('Intentionally'))
   end
 
   def test_pings_live_uri

metadata

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