zold 0.23.8 → 0.23.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd1a70efe61838a0cd3e0e4e17ef464d8c6d7791a98d24b5ecbc4ce4a43ef933
-  data.tar.gz: a00d4af1fee0f35b6e32ee8e1f2b0496cc480b61257185a6ac7ff8db5b022207
+  metadata.gz: 6adc05e3a39654916c6db0930e0cc0e2040c911ae82224e43e8fd08f534977ef
+  data.tar.gz: 5426a3ef89226b32836cbe793949d05e352af6f33e0dbfc09dc0618a72cb71ed
 SHA512:
-  metadata.gz: df4eed8f2f359d92b071bc379189b64461fce53f61f77030da4b19fedfe0cd0fdbf6eebbce84919dc8ba0d55eeb22514da0f6494a94baf919de7dbb10653451b
-  data.tar.gz: 7a95d2dd6f095e221776acb5f249f00d4e8864fba49dc1918e893b9a6bb9545930673bda1f52316d1c0cdb55b5549078777e8534c9f3fc9b2d0db82a96eeb665
+  metadata.gz: 97154e00aef0b0a65f1d13a72f2577c8aec2e0d820c852f0c855b008c0e51512cffa962ab9634dc80e0661d8b6cc57d28e35ae94c89f046ea2b61d2de91256c5
+  data.tar.gz: 77d6c919564d1412e65bfe7344006408e08d3994457c9ab6fb37c02284073146f16cfa099ca6f7274dfb12ee26b052df237d80f59e42ebafba17232f9091f9f7

data/lib/zold/commands/remote.rb

@@ -345,12 +345,13 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
     end
 
     def select(opts)
-      selected = @remotes.all.sort_by { |r| r[:score] }.reverse.first(opts['max-nodes'])
-      (@remotes.all - selected).each do |r|
-        @remotes.remove(r[:host], r[:port]) if !opts['masters-too'] || !r[:master]
+      @remotes.all.sort_by { |r| r[:score] }.reverse.each_with_index do |r, idx|
+        next if idx < opts['max-nodes']
+        next if r[:master] && !opts['masters-too']
+        @remotes.remove(r[:host], r[:port])
         @log.info("Remote #{r[:host]}:#{r[:port]}/#{r[:score]} removed from the list, #{@remotes.all.count} left")
       end
-      @log.info("#{opts['max-nodes']} remote nodes left in the list")
+      @log.info("#{@remotes.all.count} remote nodes left in the list")
     end
 
     def terminate

data/lib/zold/version.rb

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

data/test/commands/test_remote.rb

@@ -231,6 +231,16 @@ class TestRemote < Zold::Test
     end
   end
 
+  def test_select_doesnt_touch_masters
+    Dir.mktmpdir do |dir|
+      remotes = Zold::Remotes.new(file: File.join(dir, 'remotes.txt'))
+      cmd = Zold::Remote.new(remotes: remotes, log: test_log)
+      cmd.run(%w[remote masters])
+      cmd.run(%w[remote select --max-nodes=0])
+      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'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.23.8
+  version: 0.23.9
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-17 00:00:00.000000000 Z
+date: 2019-02-18 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.8!
+  Thanks for installing Zold 0.23.9!
     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