zold 0.23.6 → 0.23.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a34afacddd1a7754e904735a1260ae2502c12fd814bcc99df8b2f473442b1d67
-  data.tar.gz: 17cfee268ef91e6e2cfdbdf0b8a9a221c9728baedb9daaf93244fc3a85a7b9d0
+  metadata.gz: c510a03d5a3e6a7b5d4df8f7cf1cd90be5bb9ec44cfa8a31215f148d864edcbb
+  data.tar.gz: 42b34d4d44e8d25c67daa9eeb6053fba49bd9bb3bfd811b7686e76a266aefc55
 SHA512:
-  metadata.gz: 41b0e2d1c097cbb41588659b5baa5c0025bec91ae2f5fbb66a38678902bdbcff70dddc4194fb6c5ddad12ff83b024cc48d74802aebc948292f11d2f303181c2b
-  data.tar.gz: 07dd8014a170aa39ca0536564b66a4a7b2ea5321f6319d76d83c2f5ee3f4656cc66667a1a4ca58fc336e9b341844539626045bca631c7b1616ed6c2043dda322
+  metadata.gz: 82667cd425fec0f1fd029da8a9c418cb740da96f997a99c99a1ed02863ec995cb279636d3c62370e621ced477a3bca6f73a7407498391a4ffc6940a1dd37498b
+  data.tar.gz: '047049f8723e534ed026eb6a7701b66b6491aa9e7937954d4d49f4fc1788c553131bb5acc70ac68078b59baa8f6f53dffc03fe1e9efe51e1a4d8fda1d5a0ff06'

data/lib/zold/commands/propagate.rb

@@ -79,12 +79,12 @@ Available options:"
             next
           end
           unless target.network == network
-            @log.error("#{t.amount * -1} to #{t.bnf}: network mismatch, '#{target.network}'!='#{network}'")
+            @log.debug("#{t.amount * -1} to #{t.bnf}: network mismatch, '#{target.network}'!='#{network}'")
             next
           end
           next if target.includes_positive?(t.id, id)
           unless target.prefix?(t.prefix)
-            @log.error("#{t.amount * -1} from #{id} to #{t.bnf}: wrong prefix \"#{t.prefix}\" in \"#{t}\"")
+            @log.debug("#{t.amount * -1} from #{id} to #{t.bnf}: wrong prefix \"#{t.prefix}\" in \"#{t}\"")
             next
           end
           target.add(t.inverse(id))

data/lib/zold/commands/remote.rb

@@ -260,9 +260,15 @@ Available options:"
 
     def update(opts)
       st = Time.now
+      seen = Set.new
       capacity = []
-      opts['depth'].times do |cycle|
+      opts['depth'].times do
         @remotes.iterate(@log, farm: @farm) do |r|
+          if seen.include?(r.to_mnemo)
+            @log.debug("#{r} seen already, won't check again")
+            next
+          end
+          seen << r.to_mnemo
           start = Time.now
           update_one(r, opts) do |json, score|
             r.assert_valid_score(score)
@@ -270,11 +276,9 @@ Available options:"
             r.assert_score_strength(score) unless opts['ignore-score-weakness']
             @remotes.rescore(score.host, score.port, score.value)
             reboot(r, json, opts)
-            if cycle.positive?
-              json['all'].each do |s|
-                next if @remotes.exists?(s['host'], s['port'])
-                add(s['host'], s['port'], opts)
-              end
+            json['all'].each do |s|
+              next if @remotes.exists?(s['host'], s['port'])
+              add(s['host'], s['port'], opts)
             end
             capacity << { host: score.host, port: score.port, count: json['all'].count }
             @log.info("#{r}: the score is #{Rainbow(score.value).green} (#{json['version']}) in #{Age.new(start)}")

data/lib/zold/remotes.rb

@@ -45,6 +45,8 @@ module Zold
     # When something is wrong with the assertion
     class CantAssert < StandardError; end
 
+    attr_reader :touched
+
     def initialize(host:, port:, score:, idx:, master:, network: 'test', log: Log::NULL)
       @host = host
       @port = port
@@ -53,9 +55,11 @@ module Zold
       @master = master
       @network = network
       @log = log
+      @touched = false
     end
 
     def http(path = '/')
+      @touched = true
       Http.new(uri: "http://#{@host}:#{@port}#{path}", score: @score, network: @network)
     end
 
@@ -67,6 +71,10 @@ module Zold
       "#{@host}:#{@port}/#{@idx}"
     end
 
+    def to_mnemo
+      "#{@host}:#{@port}"
+    end
+
     def assert_code(code, response)
       msg = response.status_line.strip
       return if response.status.to_i == code
@@ -193,21 +201,22 @@ module Zold
         Thread.current.name = "remotes-#{idx}@#{r[:host]}:#{r[:port]}"
         start = Time.now
         best = farm.best[0]
+        node = RemoteNode.new(
+          host: r[:host],
+          port: r[:port],
+          score: best.nil? ? Score::ZERO : best,
+          idx: idx,
+          master: master?(r[:host], r[:port]),
+          log: log,
+          network: @network
+        )
         begin
-          yield RemoteNode.new(
-            host: r[:host],
-            port: r[:port],
-            score: best.nil? ? Score::ZERO : best,
-            idx: idx,
-            master: master?(r[:host], r[:port]),
-            log: log,
-            network: @network
-          )
+          yield node
           raise 'Took too long to execute' if (Time.now - start).round > @timeout
-          unerror(r[:host], r[:port])
+          unerror(r[:host], r[:port]) if node.touched
         rescue StandardError => e
           error(r[:host], r[:port])
-          log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message} in #{Age.new(start)}")
+          log.info("#{Rainbow(node).red}: #{e.message} in #{Age.new(start)}")
           log.debug(Backtrace.new(e).to_s)
           remove(r[:host], r[:port]) if r[:errors] > TOLERANCE
         end

data/lib/zold/version.rb

@@ -25,7 +25,7 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.23.6'
+  VERSION = '0.23.7'
   PROTOCOL = 2
   REPO = 'zold-io/zold'
 end

data/test/commands/test_remote.rb

@@ -74,7 +74,7 @@ class TestRemote < Zold::Test
       cmd.run(%w[remote add localhost 2 --skip-ping])
       assert_equal(2, remotes.all.count)
       cmd.run(['remote', 'update', '--ignore-score-weakness', '--skip-ping'])
-      assert_equal(4, remotes.all.count)
+      assert_equal(4, remotes.all.count, remotes.all)
     end
   end
 
@@ -172,7 +172,7 @@ class TestRemote < Zold::Test
       assert_equal(2, remotes.all.count)
       cmd.run(['remote', 'update', '--ignore-score-weakness'])
       cmd.run(['remote', 'trim', '--tolerate=0'])
-      assert_equal(1, remotes.all.count)
+      assert_equal(1, remotes.all.count, remotes.all)
     end
   end
 
@@ -230,4 +230,25 @@ class TestRemote < Zold::Test
       assert(!remotes.all.empty?)
     end
   end
+
+  def test_updates_just_once
+    Dir.mktmpdir do |dir|
+      remotes = Zold::Remotes.new(file: File.join(dir, 'a/b/c/remotes'))
+      zero = Zold::Score::ZERO
+      get = stub_request(:get, "http://#{zero.host}:#{zero.port}/remotes").to_return(
+        status: 200,
+        headers: {},
+        body: {
+          version: Zold::VERSION,
+          score: zero.to_h,
+          all: []
+        }.to_json
+      )
+      cmd = Zold::Remote.new(remotes: remotes, log: test_log)
+      cmd.run(['remote', 'add', zero.host, zero.port.to_s, '--skip-ping'])
+      cmd.run(['remote', 'update', '--ignore-score-weakness', '--depth=10'])
+      assert_equal(1, remotes.all.count)
+      assert_requested(get, times: 1)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.23.6
+  version: 0.23.7
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -753,7 +753,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.23.6!
+  Thanks for installing Zold 0.23.7!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try ZLD online wallet at: https://wts.zold.io