zold 0.18.9 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ad955cd4ed1c34ff735ca6684945186c29c07bf970f4bdc130ffdc0b3164922
-  data.tar.gz: 9344af265b58567d3aa2afda28815c6efaaddf0235a379d85f1ae69433112cd0
+  metadata.gz: 2b6e5a80a2216feaeb4ac83bafc229c711bb981df2c1c7fa73a828f9620580c5
+  data.tar.gz: 9cb90c56a015453a5ababcabed994a119ae44b734d557bf00f3fabebe9a06660
 SHA512:
-  metadata.gz: fba208cc63dc399eb24dd6c015f6eada0e22c9a3ca2b22d6a5612576b6ea264f2e3bc6cb57c0a69618694544928faa5f919d779c6e29d7da5137d40325e9b62e
-  data.tar.gz: bbfd1eec62d4f29272c21273aef71d9d110bbe491237b264c18f571e687d724b606861141e2efacadc3551fafe7917b2d896ed88eccc39b80f86066e226d81ee
+  metadata.gz: cbd48e9a0ac951f438964c39e98d3e5942d41665b1bb8f61d7a5ef1942947566fd6be97eea8871a317a47004812ba56cccf4a7fafd2bd552112026189158aada
+  data.tar.gz: c661f88c9fe2de378dd2bb1107f5b7cd12ca0ab2cb2fd3465070da1b7be5105c0c3627257e0cb7eb4eb9e4680f58cb8d2044ae55069ef6deeaa8158ba17e335f

data/bin/zold

@@ -177,7 +177,7 @@ remotes = Zold::Remotes.new(file: fremotes, network: opts['network'])
 if File.exist?(fremotes)
   log.debug("Remote nodes: #{remotes.all.count} total")
 else
-  remotes.defaults
+  remotes.masters
   log.debug("Default remotes have been set: #{remotes.all.count} total")
 end
 copies = File.join(zoldata, 'copies')

data/lib/zold/commands/fetch.rb

@@ -67,7 +67,7 @@ Available options:"
           'Ignore this node and don\'t fetch from it',
           default: []
         o.bool '--tolerate-edges',
-          'Don\'t fail if only "edge" (not default ones) nodes accepted the wallet',
+          'Don\'t fail if only "edge" (not "master" ones) nodes accepted the wallet',
           default: false
         o.bool '--quiet-if-absent',
           'Don\'t fail if the wallet is absent in all remote nodes',
@@ -94,22 +94,22 @@ Available options:"
       total = Concurrent::AtomicFixnum.new
       nodes = Concurrent::AtomicFixnum.new
       done = Concurrent::AtomicFixnum.new
-      defaults = Concurrent::AtomicFixnum.new
+      masters = Concurrent::AtomicFixnum.new
       @remotes.iterate(@log) do |r|
         nodes.increment
         total.increment(fetch_one(id, r, cps, opts))
-        defaults.increment if r.default?
+        masters.increment if r.master?
         done.increment
       end
       raise "There are no remote nodes, run 'zold remote reset'" if nodes.value.zero?
       unless opts['quiet-if-absent']
         raise "No nodes out of #{nodes.value} have the wallet #{id}" if done.value.zero?
-        if defaults.value.zero? && !opts['tolerate-edges']
+        if masters.value.zero? && !opts['tolerate-edges']
           raise "There are only edge nodes, run 'zold remote reset' or use --tolerate-edges"
         end
       end
       @log.info("#{done.value} copies of #{id} fetched in #{Age.new(start)} with the total score of \
-#{total.value} from #{nodes.value} nodes (#{defaults.value} defaults)")
+#{total.value} from #{nodes.value} nodes (#{masters.value} master nodes)")
       list = cps.all.map do |c|
         "  ##{c[:name]}: #{c[:score]} #{Wallet.new(c[:path]).mnemo} \
 #{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}"

data/lib/zold/commands/invoice.rb

@@ -52,7 +52,7 @@ Available options:"
           'The length of the invoice prefix (default: 8)',
           default: 8
         o.bool '--tolerate-edges',
-          'Don\'t fail if only "edge" (not default ones) nodes have the wallet',
+          'Don\'t fail if only "edge" (not "master" ones) nodes have the wallet',
           default: false
         o.string '--network',
           'The name of the network we work in',

data/lib/zold/commands/merge.rb

@@ -92,6 +92,7 @@ Available options:"
           @log.debug("Local copy of #{id} is absent, nothing to merge")
         end
       end
+      raise "There are no copies of #{id}, nothing to merge" if patch.empty?
       modified = @wallets.acq(id, exclusive: true) { |w| patch.save(w.path, overwrite: true) }
       if modified
         @log.info("#{cps.count} copies with the total score of #{score} successfully merged \

data/lib/zold/commands/node.rb

@@ -98,7 +98,7 @@ module Zold
           'Ignore score weakness of incoming requests and register those nodes anyway',
           default: false
         o.bool '--tolerate-edges',
-          'Don\'t fail if only "edge" (not default ones) nodes accepted/have the wallet',
+          'Don\'t fail if only "edge" (not "master" ones) nodes accepted/have the wallet',
           default: false
         o.boolean '--nohup',
           'Run it in background, rebooting when a higher version is available in the network',

data/lib/zold/commands/push.rb

@@ -59,7 +59,7 @@ Available options:"
           'Don\'t complain when their score is too weak',
           default: false
         o.bool '--tolerate-edges',
-          'Don\'t fail if only "edge" (not default ones) nodes accepted the wallet',
+          'Don\'t fail if only "edge" (not "master" ones) nodes accepted the wallet',
           default: false
         o.bool '--quiet-if-missed',
           'Don\'t fail if the wallet wasn\'t delivered to any remotes',
@@ -85,22 +85,22 @@ Available options:"
       total = Concurrent::AtomicFixnum.new
       nodes = Concurrent::AtomicFixnum.new
       done = Concurrent::AtomicFixnum.new
-      defaults = Concurrent::AtomicFixnum.new
+      masters = Concurrent::AtomicFixnum.new
       start = Time.now
       @remotes.iterate(@log) do |r|
         nodes.increment
         total.increment(push_one(id, r, opts))
-        defaults.increment if r.default?
+        masters.increment if r.master?
         done.increment
       end
       raise "There are no remote nodes, run 'zold remote reset'" if nodes.value.zero?
       unless opts['quiet-if-missed']
         raise "No nodes out of #{nodes} accepted the wallet #{id}" if done.value.zero?
-        if defaults.value.zero? && !opts['tolerate-edges']
+        if masters.value.zero? && !opts['tolerate-edges']
           raise "There are only edge nodes, run 'zold remote reset' or use --tolerate-edges"
         end
       end
-      @log.info("Push finished to #{done.value} nodes (#{defaults.value} defaults) \
+      @log.info("Push finished to #{done.value} nodes (#{masters.value} master nodes) \
 out of #{nodes.value} in #{Age.new(start)}, total score for #{id} is #{total.value}")
     end
 

data/lib/zold/commands/remote.rb

@@ -63,8 +63,8 @@ Available commands:
       Remove all registered remote nodes
     #{Rainbow('remote reset').green}
       Restore it back to the default list of nodes
-    #{Rainbow('remote defaults').green}
-      Add all default nodes to the list
+    #{Rainbow('remote masters').green}
+      Add all \"master\" nodes to the list
     #{Rainbow('remote add').green} host [port]
       Add a new remote node
     #{Rainbow('remote remove').green} host [port]
@@ -139,8 +139,8 @@ Available options:"
         clean
       when 'reset'
         reset(opts)
-      when 'defaults'
-        defaults(opts)
+      when 'masters'
+        masters(opts)
       when 'add'
         add(mine[1], mine[2] ? mine[2].to_i : Remotes::PORT, opts)
       when 'remove'
@@ -175,14 +175,14 @@ Available options:"
 
     def reset(opts)
       clean
-      defaults(opts)
+      masters(opts)
     end
 
-    def defaults(opts)
-      @remotes.defaults do |host, port|
+    def masters(opts)
+      @remotes.masters do |host, port|
         !opts['ignore-node'].include?("#{host}:#{port}")
       end
-      @log.debug("Default remote nodes were added to the list, #{@remotes.all.count} total")
+      @log.debug("Masters nodes were added to the list, #{@remotes.all.count} total")
     end
 
     def add(host, port, opts)

data/lib/zold/commands/remove.rb

@@ -44,6 +44,9 @@ module Zold
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = "Usage: zold remove [ID...] [options]
 Available options:"
+        o.bool '--force',
+          'Don\'t report any errors if the wallet doesn\'t exist',
+          default: false
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
@@ -52,10 +55,14 @@ Available options:"
       end
     end
 
-    def remove(id, _)
+    def remove(id, opts)
       @wallets.acq(id, exclusive: true) do |w|
-        raise "Wallet #{id} doesn't exist in #{w.path}" unless w.exists?
-        File.delete(w.path)
+        if w.exists?
+          File.delete(w.path)
+        else
+          raise "Wallet #{id} doesn't exist in #{w.path}" unless opts['force']
+          @log.info("Wallet #{id} file not found in #{w.path}")
+        end
       end
       @log.info("Wallet #{id} removed")
     end

data/lib/zold/commands/routines/reconnect.rb

@@ -46,7 +46,7 @@ module Zold
         args = ['remote', "--network=#{@opts['network']}", '--ignore-ping']
         score = @farm.best[0]
         args << "--ignore-node=#{score.host}:#{score.port}" if score
-        cmd.run(args + ['defaults']) unless @opts['routine-immediately']
+        cmd.run(args + ['masters']) unless @opts['routine-immediately']
         return if @opts['routine-immediately'] && @remotes.all.empty?
         cmd.run(args + ['update'] + (@opts['never-reboot'] ? [] : ['--reboot']))
         cmd.run(args + ['trim'])

data/lib/zold/node/front.rb

@@ -84,6 +84,7 @@ module Zold
     before do
       Thread.current.name = "#{request.request_method}:#{request.url}"
       Thread.current.thread_variable_set(:uri, request.url)
+      error(400, 'Can\'t detect your IP') if request.ip.nil? || request.ip.empty?
       Thread.current.thread_variable_set(:ip, request.ip)
       @start = Time.now
       if !settings.opts['halt-code'].empty? && params[:halt] && params[:halt] == settings.opts['halt-code']

data/lib/zold/patch.rb

@@ -104,7 +104,8 @@ module Zold
             next
           end
           unless @wallets.acq(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
-            @log.error("The beneficiary of #{@id} doesn't have this transaction: \"#{txn.to_text}\"")
+            @log.error("The beneficiary #{@wallets.acq(txn.bnf, &:mnemo)} of #{@id} \
+doesn't have this transaction: \"#{txn.to_text}\"")
             next
           end
         end
@@ -113,9 +114,13 @@ module Zold
       end
     end
 
+    def empty?
+      @id.nil?
+    end
+
     # Returns TRUE if the file was actually modified
     def save(file, overwrite: false)
-      raise 'You have to join at least one wallet in' if @id.nil?
+      raise 'You have to join at least one wallet in' if empty?
       before = ''
       before = IO.read(file) if File.exist?(file)
       wallet = Wallet.new(file)

data/lib/zold/remotes.rb

@@ -51,8 +51,8 @@ module Zold
     MAX_NODES = 16
 
     # Default nodes and their ports
-    DEFS = CSV.read(File.expand_path(File.join(File.dirname(__FILE__), '../../resources/remotes')))
-    private_constant :DEFS
+    MASTERS = CSV.read(File.expand_path(File.join(File.dirname(__FILE__), '../../resources/masters')))
+    private_constant :MASTERS
 
     # Empty, for standalone mode
     class Empty
@@ -88,8 +88,8 @@ module Zold
         Http.new(uri: "http://#{@host}:#{@port}#{path}", score: @score, network: @network)
       end
 
-      def default?
-        !DEFS.find { |r| r[0] == @host && r[1].to_i == @port }.nil?
+      def master?
+        !MASTERS.find { |r| r[0] == @host && r[1].to_i == @port }.nil?
       end
 
       def to_s
@@ -148,8 +148,8 @@ module Zold
       modify { [] }
     end
 
-    def defaults
-      DEFS.each do |r|
+    def masters
+      MASTERS.each do |r|
         if block_given?
           next unless yield(r[0], r[1].to_i)
         end
@@ -235,8 +235,8 @@ module Zold
       File.exist?(@file) ? File.mtime(@file) : Time.now
     end
 
-    def default?(host, port)
-      !DEFS.find { |r| r[0] == host && r[1].to_i == port }.nil?
+    def master?(host, port)
+      !MASTERS.find { |r| r[0] == host && r[1].to_i == port }.nil?
     end
 
     private
@@ -276,7 +276,7 @@ module Zold
             port: row[1].to_i,
             score: row[2].to_i,
             errors: row[3].to_i,
-            default: default?(row[0], row[1].to_i)
+            master: master?(row[0], row[1].to_i)
           }
         end
         raw.reject { |r| !r[:host] || r[:port].zero? }.map do |r|

data/lib/zold/thread_pool.rb

@@ -125,7 +125,7 @@ it was alive for #{Age.new(@start)}: #{@threads.map { |t| "#{t.name}/#{t.status}
           name: t.name,
           status: t.status,
           alive: t.alive?,
-          vars: t.thread_variables.map { |v| { v.to_s => t.thread_variable_get(v) } }
+          vars: Hash[t.thread_variables.map { |v| [v.to_s, t.thread_variable_get(v)] }]
         }
       end
     end

data/lib/zold/version.rb

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

data/test/commands/test_remote.rb

@@ -193,7 +193,7 @@ class TestRemote < Zold::Test
   def test_select_respects_max_nodes_option
     Dir.mktmpdir do |dir|
       remotes = Zold::Remotes.new(file: File.join(dir, 'remotes.txt'))
-      remotes.defaults
+      remotes.masters
       zero = Zold::Score::ZERO
       cmd = Zold::Remote.new(remotes: remotes, log: test_log)
       (5000..5010).each do |port|
@@ -215,17 +215,17 @@ class TestRemote < Zold::Test
         )
         cmd.run(%W[remote add localhost #{port}])
       end
-      assert_equal(11 + File.readlines('resources/remotes').count, remotes.all.count)
+      assert_equal(11 + File.readlines('resources/masters').count, remotes.all.count)
       cmd.run(%w[remote select --max-nodes=5])
       assert_equal(5, remotes.all.count)
     end
   end
 
-  def test_sets_defaults
+  def test_sets_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 defaults])
+      cmd.run(%w[remote masters])
       assert(!remotes.all.empty?)
     end
   end

data/test/commands/test_remove.rb

@@ -54,4 +54,13 @@ class TestRemove < Zold::Test
       assert(home.wallets.all.empty?)
     end
   end
+
+  def test_removes_absent_wallets
+    FakeHome.new(log: test_log).run do |home|
+      Zold::Remove.new(wallets: home.wallets, log: test_log).run(
+        ['remove', '7654321076543210', '--force']
+      )
+      assert(home.wallets.all.empty?)
+    end
+  end
 end

data/test/test_remotes.rb

@@ -45,12 +45,12 @@ class TestRemotes < Zold::Test
     end
   end
 
-  def test_finds_defaults
+  def test_finds_masters
     Dir.mktmpdir do |dir|
       file = File.join(dir, 'remotes')
       FileUtils.touch(file)
       remotes = Zold::Remotes.new(file: file)
-      assert(remotes.default?('b1.zold.io', 80))
+      assert(remotes.master?('b1.zold.io', 80))
     end
   end
 
@@ -166,8 +166,8 @@ class TestRemotes < Zold::Test
     Dir.mktmpdir do |dir|
       remotes = Zold::Remotes.new(file: File.join(dir, 'remotes'))
       remotes.clean
-      remotes.defaults
-      remotes.defaults
+      remotes.masters
+      remotes.masters
       assert(!remotes.all.empty?)
     end
   end

data/test/test_thread_pool.rb

@@ -102,7 +102,18 @@ class TestThreadPool < Zold::Test
 
   def test_prints_to_json
     pool = Zold::ThreadPool.new('test', log: test_log)
+    pool.add do
+      Thread.current.thread_variable_set(:foo, 1)
+      loop do
+        # forever
+      end
+    end
     assert(pool.to_json.is_a?(Array))
+    assert_equal('test', pool.to_json[0][:name])
+    assert_equal('run', pool.to_json[0][:status])
+    assert_equal(true, pool.to_json[0][:alive])
+    assert_equal(1, pool.to_json[0][:vars]['foo'])
+    pool.kill
   end
 
   def test_prints_to_text

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.18.9
+  version: 0.19.0
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -610,7 +610,7 @@ files:
 - lib/zold/version_file.rb
 - lib/zold/wallet.rb
 - lib/zold/wallets.rb
-- resources/remotes
+- resources/masters
 - resources/root.pub
 - test/commands/routines/test_gc.rb
 - test/commands/routines/test_reconnect.rb
@@ -690,7 +690,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.18.9!
+  Thanks for installing Zold 0.19.0!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try online wallet at: https://wts.zold.io