zold 0.14.13 → 0.14.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15c46c2740b4034dae78391ab88d747116977858
-  data.tar.gz: 89bcbf8445379dddbff308e0dfb0a60fb11157e6
+  metadata.gz: 71369b8c56264180688b1f2e6fa6f9ce74bdbfd7
+  data.tar.gz: ae47e1e2501eab7fbb340b061f87c075884da2f0
 SHA512:
-  metadata.gz: 1236cdbd4219b2b61dd11ffe556f26e867a2a91985d14c1d670ed2388393451e38fef70baefbaa0dd699c56b754798350a9e9afbdd116fdb7f5e21b0074ee586
-  data.tar.gz: ae55db8d0224a10c1facebf9a3e52dc2f7be2baf9285138af232b808bba340171f74335237abf0a13909e24bf772671016de48873ec04858d552c8fc44905975
+  metadata.gz: 0445e6669bb843b41ffee95c9ea388ec452551fc7c833d3ddc3cfd7fbdd0bbba646974289500ed47ab7ed93e4928ac1e4e1d146fbfcd0bbff5f4e5218153b560
+  data.tar.gz: 4a1ecaea86ffa87784b43c92ec23415032bfd41e929f86759512beea2c778a333a4e05b4c64dbd892fe7c530c4d012e99505ddf67abdde88d1a70639c6d284a5

data/fixtures/scripts/distribute-wallet.sh

@@ -33,7 +33,8 @@ zold --home=${second} remote add localhost ${first}
 # the wallet to the remote, expecting it to distribute it to the second
 # wallet automatically.
 zold --public-key=id_rsa.pub create 0000000000000000
-zold pay --private-key=id_rsa 0000000000000000 NOPREFIX@aaaabbbbccccdddd 4.95 'To help you, dude!'
+zold pay --private-key=id_rsa 0000000000000000 NOPREFIX@aaaabbbbccccdddd 4.95 'For the book'
+zold remote clean
 zold remote add localhost ${first}
 zold push 0000000000000000
 zold remote clean
@@ -78,7 +79,7 @@ until zold fetch 0000000000000000 --ignore-score-weakness; do
   ((i++)) || sleep 1
   if ((i==5)); then
     cat ${first}/log.txt
-    echo "The wallet has not been spread, after ${i} attempts"
+    echo "The wallet 0000000000000000 has not been spread, after ${i} attempts"
     exit 8
   fi
   sleep 1

data/lib/zold/commands/node.rb

@@ -34,6 +34,7 @@ require_relative '../node/entrance'
 require_relative '../node/safe_entrance'
 require_relative '../node/spread_entrance'
 require_relative '../node/async_entrance'
+require_relative '../node/nodup_entrance'
 require_relative '../node/front'
 require_relative '../node/farm'
 require_relative 'pull'
@@ -165,20 +166,25 @@ module Zold
         invoice = Invoice.new(wallets: @wallets, log: @log).run(['invoice', invoice])
       end
       SafeEntrance.new(
-        AsyncEntrance.new(
-          SpreadEntrance.new(
-            Entrance.new(@wallets, @remotes, @copies, address, log: @log, network: opts['network']),
-            @wallets, @remotes, address,
-            log: @log,
-            ignore_score_weakeness: opts['ignore-score-weakness']
-          ), File.join(Dir.pwd, '.zoldata/entrance'), log: @log
-        ), network: opts['network']
+        NoDupEntrance.new(
+          AsyncEntrance.new(
+            SpreadEntrance.new(
+              Entrance.new(@wallets, @remotes, @copies, address, log: @log, network: opts['network']),
+              @wallets, @remotes, address,
+              log: @log,
+              ignore_score_weakeness: opts['ignore-score-weakness']
+            ),
+            File.join(Dir.pwd, '.zoldata/entrance'), log: @log
+          ),
+          @wallets
+        ),
+        network: opts['network']
       ).start do |entrance|
         Front.set(:entrance, entrance)
         Farm.new(invoice, File.join(Dir.pwd, 'farm'), log: @log)
           .start(host, opts[:port], threads: opts[:threads], strength: opts[:strength]) do |farm|
           Front.set(:farm, farm)
-          metronome(farm, entrance, opts).start do |metronome|
+          metronome(farm, opts).start do |metronome|
             Front.set(:metronome, metronome)
             @log.info("Starting up the web front at http://#{host}:#{opts[:port]}...")
             Front.run!
@@ -244,13 +250,13 @@ module Zold
       pid
     end
 
-    def metronome(farm, entrance, opts)
+    def metronome(farm, opts)
       metronome = Metronome.new(@log)
       require_relative 'routines/spread'
-      metronome.add(Routines::Spread.new(opts, @wallets, entrance, log: @log))
+      metronome.add(Routines::Spread.new(opts, @wallets, @remotes, log: @log))
       unless opts['standalone']
         require_relative 'routines/reconnect'
-        metronome.add(Routines::Reconnect.new(opts, @remotes, farm, log: Log::Quiet.new))
+        metronome.add(Routines::Reconnect.new(opts, @remotes, farm, network: opts['network'], log: Log::Quiet.new))
       end
       @log.info('Metronome created')
       metronome

data/lib/zold/commands/pay.rb

@@ -81,7 +81,7 @@ Available options:"
       if Tax.new(from).in_debt? && !opts['dont-pay-taxes']
         require_relative 'taxes'
         Taxes.new(wallets: @wallets, remotes: @remotes, log: @log).run(
-          ['taxes', "--private-key=#{opts['private-key']}", id.to_s]
+          ['taxes', 'pay', "--private-key=#{opts['private-key']}", id.to_s]
         )
       end
       pay(from, invoice, amount, details, opts)

data/lib/zold/commands/remote.rb

@@ -80,6 +80,9 @@ Available options:"
         o.bool '--ignore-score-value',
           'Don\'t complain when their score is too small',
           default: false
+        o.bool '--min-score',
+          "The minimum score required for winning the election (default: #{Tax::EXACT_SCORE})",
+          default: Tax::EXACT_SCORE
         o.bool '--force',
           'Add/remove if if this operation is not possible',
           default: false
@@ -192,7 +195,7 @@ Available options:"
         r.assert_valid_score(score)
         r.assert_score_ownership(score)
         r.assert_score_strength(score) unless opts['ignore-score-weakness']
-        r.assert_score_value(score, Tax::EXACT_SCORE) unless opts['ignore-score-value']
+        r.assert_score_value(score, opts['min-score']) unless opts['ignore-score-value']
         scores << score
       end
       scores = scores.sample(1)
@@ -254,11 +257,9 @@ in #{(Time.now - start).round(2)}s")
     end
 
     def select(opts)
-      max_nodes = opts['max-nodes']
-      @log.info("Selecting #{max_nodes} strongest nodes.")
-      selected_remotes = @remotes.all.sort_by { |remote| remote[:score] }.first(max_nodes)
-      (@remotes.all - selected_remotes).each do |weak_remote|
-        @remotes.remove(weak_remote[:host], weak_remote[:port])
+      selected = @remotes.all.sort_by { |r| r[:score] }.first(opts['max-nodes'])
+      (@remotes.all - selected).each do |r|
+        @remotes.remove(r[:host], r[:port])
       end
     end
 

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

@@ -32,22 +32,22 @@ module Zold
   module Routines
     # Reconnect to the network
     class Reconnect
-      def initialize(opts, remotes, farm = Farm::Empty.new, log: Log::Quiet.new)
+      def initialize(opts, remotes, farm = Farm::Empty.new, network: 'test', log: Log::Quiet.new)
         @opts = opts
         @remotes = remotes
         @farm = farm
+        @network = network
         @log = log
       end
 
       def exec(_ = 0)
         sleep(60) unless @opts['routine-immediately']
-        unless @opts['routine-immediately']
-          Remote.new(remotes: @remotes, log: @log).run(%w[remote add b1.zold.io 80 --force])
-        end
-        Remote.new(remotes: @remotes, log: @log).run(%w[remote trim])
-        Remote.new(remotes: @remotes, farm: @farm, log: @log).run(
-          %w[remote update] + (@opts['never-reboot'] ? [] : ['--reboot'])
-        )
+        cmd = Remote.new(remotes: @remotes, log: @log, farm: @farm)
+        args = ['remote', "--network=#{@opts['network']}"]
+        cmd.run(args + ['add', 'b1.zold.io', '80', '--force']) unless @opts['routine-immediately']
+        cmd.run(args + ['trim'])
+        cmd.run(args + ['select'])
+        cmd.run(args + ['update'] + (@opts['never-reboot'] ? [] : ['--reboot']))
       end
     end
   end

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

@@ -20,9 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require_relative '../remote'
-require_relative '../pull'
-require_relative '../pay'
+require_relative '../../log'
+require_relative '../../id'
 require_relative '../push'
 
 # Spread random wallets to the network.
@@ -34,22 +33,25 @@ module Zold
   module Routines
     # Spread them
     class Spread
-      def initialize(opts, wallets, entrance, log: Log::Quiet.new)
+      def initialize(opts, wallets, remotes, log: Log::Quiet.new)
         @opts = opts
         @wallets = wallets
-        @entrance = entrance
+        @remotes = remotes
         @log = log
       end
 
       def exec(_ = 0)
+        return if @remotes.all.empty?
         sleep(60) unless @opts['routine-immediately']
-        pushed = []
-        @wallets.all.sample(10).map do |w|
-          id = Id.new(w)
-          @entrance.push(id, File.read(@wallets.find(id).path))
-          pushed << id
+        ids = @wallets.all.sample(10)
+        Push.new(wallets: @wallets, remotes: @remotes, log: @log).run(
+          ['push', "--network=#{@opts['network']}"] + ids
+        )
+        if ids.empty?
+          @log.info("Spread didn't push any wallets, we are empty")
+        else
+          @log.info("Spread #{ids.count} random wallets out of #{@wallets.all.count}: #{ids.join(', ')}")
         end
-        @log.info("Spread #{pushed.count} random wallets out of #{@wallets.all.count}: #{pushed.join(', ')}")
       end
     end
   end

data/lib/zold/http.rb

@@ -54,6 +54,12 @@ module Zold
     # protocol.
     PROTOCOL_HEADER = 'X-Zold-Protocol'
 
+    # Read timeout in seconds
+    READ_TIMEOUT = 32
+
+    # Connect timeout in seconds
+    CONNECT_TIMEOUT = 8
+
     # @todo #98:30m/DEV The following two statements are seen as issues by rubocop
     #  raising a Lint/AmbiguousBlockAssociation offense. It is somthing
     #  that could be solved by changing the TargetRubyVersion in .rubocop.yml
@@ -70,8 +76,8 @@ module Zold
 
     def get
       http = Net::HTTP.new(uri.host, uri.port)
-      http.read_timeout = 8
-      http.open_timeout = 4
+      http.read_timeout = Http::READ_TIMEOUT
+      http.open_timeout = Http::CONNECT_TIMEOUT
       path = uri.path
       path += '?' + uri.query if uri.query
       http.request_get(path, headers)
@@ -81,8 +87,8 @@ module Zold
 
     def put(body)
       http = Net::HTTP.new(uri.host, uri.port)
-      http.read_timeout = 16
-      http.open_timeout = 4
+      http.read_timeout = Http::READ_TIMEOUT
+      http.open_timeout = Http::CONNECT_TIMEOUT
       path = uri.path
       path += '?' + uri.query if uri.query
       http.request_put(

data/lib/zold/metronome.rb

@@ -53,6 +53,7 @@ module Zold
       alive = true
       @routines.each do |r|
         @threads << Thread.start do
+          Thread.current.abort_on_exception = true
           Thread.current.name = r.class.name
           Thread.current.priority = -100
           step = 0

data/lib/zold/node/async_entrance.rb

@@ -88,10 +88,12 @@ module Zold
       end
     end
 
+    # Always returns an array with a single ID of the pushed wallet
     def push(id, body)
       @mutex.synchronize do
         AtomicFile.new(File.join(@dir, id.to_s)).write(body)
       end
+      [id]
     end
 
     private

data/lib/zold/node/entrance.rb

@@ -95,8 +95,8 @@ module Zold
         @log.info("Accepted #{id} in #{sec}s and modified #{modified.join(', ')}")
       end
       @mutex.synchronize do
-        @history.shift if @history.length > 16
-        @speed.shift if @speed.length > 64
+        @history.shift if @history.length >= 16
+        @speed.shift if @speed.length >= 64
         wallet = @wallets.find(id)
         @history << "#{id}/#{sec}/#{modified.count}/#{wallet.balance.to_zld}/#{wallet.txns.count}t"
         @speed << sec

data/lib/zold/node/farm.rb

@@ -76,6 +76,7 @@ module Zold
       @log.info("#{@pipeline.size} scores pre-loaded, the best is: #{best[0]}")
       @threads = (1..threads).map do |t|
         Thread.new do
+          Thread.current.abort_on_exception = true
           Thread.current.name = "f#{t}"
           Thread.current.priority = -100
           loop do
@@ -87,7 +88,9 @@ module Zold
       end
       alive = true
       @cleanup = Thread.new do
+        Thread.current.abort_on_exception = true
         Thread.current.name = 'cleanup'
+        Thread.current.priority = -100
         while alive
           sleep(60) unless strength == 1 # which will only happen in tests
           VerboseThread.new(@log).run do

data/lib/zold/node/front.rb

@@ -71,7 +71,8 @@ module Zold
     before do
       check_header(Http::NETWORK_HEADER) do |header|
         if header != settings.network
-          raise "Network name mismatch, you are in '#{header}', we are in '#{settings.network}'"
+          raise "Network name mismatch at #{request.url}, #{request.ip} is in '#{header}', \
+while #{settings.address} is in '#{settings.network}'"
         end
       end
       check_header(Http::PROTOCOL_HEADER) do |header|
@@ -162,6 +163,8 @@ module Zold
       content_type 'application/json'
       {
         version: settings.version,
+        protocol: settings.protocol,
+        id: wallet.id.to_s,
         score: score.to_h,
         wallets: settings.wallets.all.count,
         mtime: wallet.mtime.utc.iso8601,
@@ -171,6 +174,25 @@ module Zold
       }.to_json
     end
 
+    get %r{/wallet/(?<id>[A-Fa-f0-9]{16}).json} do
+      id = Id.new(params[:id])
+      wallet = settings.wallets.find(id)
+      error 404 unless wallet.exists?
+      content_type 'application/json'
+      {
+        version: settings.version,
+        protocol: settings.protocol,
+        id: wallet.id.to_s,
+        score: score.to_h,
+        wallets: settings.wallets.all.count,
+        key: wallet.key.to_pub,
+        mtime: wallet.mtime.utc.iso8601,
+        digest: wallet.digest,
+        balance: wallet.balance.to_i,
+        txns: wallet.txns.count
+      }.to_json
+    end
+
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/balance} do
       id = Id.new(params[:id])
       wallet = settings.wallets.find(id)
@@ -184,7 +206,7 @@ module Zold
       wallet = settings.wallets.find(id)
       error 404 unless wallet.exists?
       content_type 'text/plain'
-      wallet.key.to_s
+      wallet.key.to_pub
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/mtime} do
@@ -225,16 +247,12 @@ module Zold
     end
 
     put %r{/wallet/(?<id>[A-Fa-f0-9]{16})/?} do
-      id = Id.new(params[:id])
-      wallet = settings.wallets.find(id)
       request.body.rewind
-      after = request.body.read.to_s
-      before = wallet.exists? ? AtomicFile.new(wallet.path).read.to_s : ''
-      if before == after
+      modified = settings.entrance.push(Id.new(params[:id]), request.body.read.to_s)
+      if modified.empty?
         status 304
         return
       end
-      settings.entrance.push(id, after)
       JSON.pretty_generate(
         version: settings.version,
         score: score.to_h,

data/lib/zold/node/nodup_entrance.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'tempfile'
+require_relative '../log'
+require_relative '../wallet'
+require_relative '../atomic_file'
+
+# The entrance that ignores duplicates.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # The safe entrance
+  class NoDupEntrance
+    def initialize(entrance, wallets, log: Log::Quiet.new)
+      raise 'Entrance can\'t be nil' if entrance.nil?
+      @entrance = entrance
+      raise 'Wallets can\'t be nil' if wallets.nil?
+      @wallets = wallets
+      raise 'Log can\'t be nil' if log.nil?
+      @log = log
+    end
+
+    def start
+      @entrance.start { yield(self) }
+    end
+
+    def to_json
+      @entrance.to_json
+    end
+
+    # Returns a list of modifed wallets (as Zold::Id)
+    def push(id, body)
+      raise 'Id can\'t be nil' if id.nil?
+      raise 'Id must be of type Id' unless id.is_a?(Id)
+      raise 'Body can\'t be nil' if body.nil?
+      Tempfile.open(['', Wallet::EXTENSION]) do |f|
+        File.write(f, body)
+        wallet = Wallet.new(f.path)
+        wallet.refurbish
+        after = File.read(wallet.path)
+        wallet = @wallets.find(id)
+        before = wallet.exists? ? AtomicFile.new(wallet.path).read.to_s : ''
+        if before == after
+          @log.info("Duplicate of #{id}/#{wallet.digest[0, 6]}/#{after.length}b/#{wallet.txns.count}t ignored")
+          return []
+        end
+        @log.info("New content for #{id} arrived, #{before.length}b before and #{after.length}b after")
+        @entrance.push(id, body)
+      end
+    end
+  end
+end

data/lib/zold/remotes.rb

@@ -186,6 +186,7 @@ module Zold
       pool = Concurrent::FixedThreadPool.new([all.count, Concurrent.processor_count * 4].min, max_queue: 0)
       all.each do |r|
         pool.post do
+          Thread.current.abort_on_exception = true
           Thread.current.name = 'remotes'
           Thread.current.priority = -100
           start = Time.now
@@ -197,14 +198,14 @@ module Zold
             error(r[:host], r[:port])
             errors = errors(r[:host], r[:port])
             log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message} \
-  in #{(Time.now - start).round}s; errors=#{errors}")
+in #{(Time.now - start).round}s; errors=#{errors}")
             log.debug(Backtrace.new(e).to_s)
             remove(r[:host], r[:port]) if errors > Remotes::TOLERANCE
           end
         end
       end
       pool.shutdown
-      raise 'Failed to terminate the pool' unless pool.wait_for_termination(60)
+      pool.kill unless pool.wait_for_termination(5 * 60)
     end
 
     def errors(host, port = Remotes::PORT)

data/lib/zold/tax.rb

@@ -33,7 +33,7 @@ module Zold
   # A single tax payment
   class Tax
     # The exact score a wallet can buy in order to pay taxes.
-    EXACT_SCORE = 16
+    EXACT_SCORE = 8
 
     # The maximum allowed amount in one transaction.
     MAX_PAYMENT = Amount.new(zld: 1.0)

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.14.13'
+  VERSION = '0.14.14'
   PROTOCOL = 2
 end

data/lib/zold/wallet.rb

@@ -172,7 +172,9 @@ module Zold
     end
 
     def refurbish
-      AtomicFile.new(@file).write("#{network}\n#{protocol}\n#{id}\n#{key.to_pub}\n\n#{txns.join("\n")}\n")
+      AtomicFile.new(@file).write(
+        "#{network}\n#{protocol}\n#{id}\n#{key.to_pub}\n\n#{txns.map { |t| t.to_s + "\n" }.join}"
+      )
     end
 
     private

data/test/commands/routines/test_spread.rb

@@ -39,10 +39,7 @@ class TestSpread < Minitest::Test
       opts = {
         'routine-immediately' => true
       }
-      entrance = Zold::Entrance.new(
-        home.wallets, home.remotes, home.copies(home.create_wallet).root, 'x', log: test_log
-      )
-      Zold::Routines::Spread.new(opts, home.wallets, entrance, log: test_log).exec
+      Zold::Routines::Spread.new(opts, home.wallets, home.remotes, log: test_log).exec
     end
   end
 end

data/test/node/test_nodup_entrance.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require_relative '../fake_home'
+require_relative '../test__helper'
+require_relative '../../lib/zold/id'
+require_relative '../../lib/zold/node/nodup_entrance'
+require_relative 'fake_entrance'
+
+# NoDupEntrance test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestAsyncEntrance < Minitest::Test
+  def test_ignores_dup
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      Zold::NoDupEntrance.new(RealEntrance.new, home.wallets, log: test_log).start do |e|
+        assert(e.push(wallet.id, File.read(wallet.path)).empty?)
+      end
+    end
+  end
+
+  class RealEntrance < FakeEntrance
+    def push(id, _)
+      [id]
+    end
+  end
+end

data/test/test_wallet.rb

@@ -56,9 +56,21 @@ class TestWallet < Minitest::Test
       key = Zold::Key.new(file: 'fixtures/id_rsa')
       wallet.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
       wallet.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
+      before = File.read(wallet.path)
       File.write(wallet.path, File.read(wallet.path) + "\n\n\n")
       wallet.refurbish
       assert_equal(amount * -2, wallet.balance)
+      assert_equal(before, File.read(wallet.path))
+    end
+  end
+
+  def test_refurbishes_empty_wallet
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      before = File.read(wallet.path)
+      File.write(wallet.path, File.read(wallet.path) + "\n\n\n")
+      wallet.refurbish
+      assert_equal(before, File.read(wallet.path))
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.13
+  version: 0.14.14
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -405,7 +405,6 @@ files:
 - lib/zold/commands/pull.rb
 - lib/zold/commands/push.rb
 - lib/zold/commands/remote.rb
-- lib/zold/commands/routines/bonuses.rb
 - lib/zold/commands/routines/reconnect.rb
 - lib/zold/commands/routines/spread.rb
 - lib/zold/commands/show.rb
@@ -424,6 +423,7 @@ files:
 - lib/zold/node/entrance.rb
 - lib/zold/node/farm.rb
 - lib/zold/node/front.rb
+- lib/zold/node/nodup_entrance.rb
 - lib/zold/node/safe_entrance.rb
 - lib/zold/node/spread_entrance.rb
 - lib/zold/patch.rb
@@ -441,7 +441,6 @@ files:
 - lib/zold/wallet.rb
 - lib/zold/wallets.rb
 - resources/remotes
-- test/commands/routines/test_bonuses.rb
 - test/commands/routines/test_reconnect.rb
 - test/commands/routines/test_spread.rb
 - test/commands/test_alias.rb
@@ -468,6 +467,7 @@ files:
 - test/node/test_entrance.rb
 - test/node/test_farm.rb
 - test/node/test_front.rb
+- test/node/test_nodup_entrance.rb
 - test/node/test_safe_entrance.rb
 - test/node/test_spread_entrance.rb
 - test/test__helper.rb
@@ -528,7 +528,6 @@ test_files:
 - features/gem_package.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
-- test/commands/routines/test_bonuses.rb
 - test/commands/routines/test_reconnect.rb
 - test/commands/routines/test_spread.rb
 - test/commands/test_alias.rb
@@ -555,6 +554,7 @@ test_files:
 - test/node/test_entrance.rb
 - test/node/test_farm.rb
 - test/node/test_front.rb
+- test/node/test_nodup_entrance.rb
 - test/node/test_safe_entrance.rb
 - test/node/test_spread_entrance.rb
 - test/test__helper.rb

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

@@ -1,78 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2018 Yegor Bugayenko
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the 'Software'), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require_relative '../remote'
-require_relative '../pull'
-require_relative '../pay'
-require_relative '../push'
-
-# Pay bonuses routine.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
-# License:: MIT
-module Zold
-  # Routines module
-  module Routines
-    # Pay bonuses to random nodes
-    class Bonuses
-      def initialize(opts, wallets, remotes, copies, farm, log: Log::Quiet.new)
-        @opts = opts
-        @wallets = wallets
-        @remotes = remotes
-        @copies = copies
-        @farm = farm
-        @log = log
-      end
-
-      def exec(_ = 0)
-        sleep(@opts['bonus-time'] * 60) unless @opts['routine-immediately']
-        raise '--private-key is required to pay bonuses' unless @opts['private-key']
-        raise '--bonus-wallet is required to pay bonuses' unless @opts['bonus-wallet']
-        raise '--bonus-amount is required to pay bonuses' unless @opts['bonus-amount']
-        winners = Remote.new(remotes: @remotes, log: @log, farm: @farm).run(
-          ['remote', 'elect', @opts['bonus-wallet'], '--private-key', @opts['private-key']] +
-          (@opts['ignore-score-weakness'] ? ['--ignore-score-weakness'] : [])
-        )
-        return if winners.empty?
-        unless @wallets.find(Id.new(@opts['bonus-wallet'])).exists?
-          Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
-            ['pull', @opts['bonus-wallet']] +
-            (@opts['ignore-score-weakness'] ? ['--ignore-score-weakness'] : [])
-          )
-        end
-        winners.each do |score|
-          Pay.new(wallets: @wallets, remotes: @remotes, log: @log).run(
-            [
-              'pay', @opts['bonus-wallet'], score.invoice, @opts['bonus-amount'].to_s,
-              "Hosting bonus for #{score.host} #{score.port} #{score.value}",
-              '--private-key', @opts['private-key']
-            ]
-          )
-        end
-        Push.new(wallets: @wallets, remotes: @remotes, log: @log).run(
-          ['push', @opts['bonus-wallet']] +
-          (@opts['ignore-score-weakness'] ? ['--ignore-score-weakness'] : [])
-        )
-      end
-    end
-  end
-end

data/test/commands/routines/test_bonuses.rb

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2018 Yegor Bugayenko
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the 'Software'), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require 'minitest/autorun'
-require 'webmock/minitest'
-require_relative '../../test__helper'
-require_relative '../../fake_home'
-require_relative '../../node/fake_node'
-require_relative '../../../lib/zold/node/farm.rb'
-require_relative '../../../lib/zold/commands/push'
-require_relative '../../../lib/zold/commands/pay'
-require_relative '../../../lib/zold/commands/routines/bonuses.rb'
-
-# Bonuses test.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
-# License:: MIT
-class TestBonuses < Minitest::Test
-  def test_pays_bonuses
-    FakeHome.new.run do |home|
-      FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
-        bank = home.create_wallet
-        Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
-          ['pay', home.create_wallet.id.to_s, bank.id.to_s, '100', '--force', '--private-key=id_rsa']
-        )
-        assert_equal(Zold::Amount.new(zld: 100.0), bank.balance)
-        opts = {
-          'ignore-score-weakness' => true,
-          'routine-immediately' => true,
-          'private-key' => 'id_rsa',
-          'bonus-wallet' => bank.id.to_s,
-          'bonus-amount' => 1,
-          'bonus-time' => 0
-        }
-        score = Zold::Score.new(
-          time: Time.now, host: 'fake-node.local', port: 999, invoice: 'NOPREFIX@ffffffffffffffff', strength: 1
-        )
-        16.times { score = score.next }
-        remotes = home.remotes
-        remotes.add('localhost', port)
-        remotes.add(score.host, score.port)
-        stub_request(:get, "http://#{score.host}:#{score.port}/").to_return(
-          status: 200,
-          body: {
-            version: Zold::VERSION,
-            score: score.to_h
-          }.to_json
-        )
-        Zold::Routines::Bonuses.new(
-          opts, home.wallets, remotes, home.copies(bank).root,
-          Zold::Farm::Empty.new, log: test_log
-        ).exec
-        assert_equal(Zold::Amount.new(zld: 99.0), bank.balance)
-      end
-    end
-  end
-end