zold 0.14.4 → 0.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8506b67f7b833f450efcf81d313c1598cc8a8dc
-  data.tar.gz: bbb006a82c64e5647c975d116543ebc1412b237e
+  metadata.gz: 02756005fb2c93a0d5f761508fd96a03ced75595
+  data.tar.gz: eca849a45be0c29b8e5e11b7579ab16f15429388
 SHA512:
-  metadata.gz: 6c93783eea87d06905b377242838684e8e9d58e653cd3dcfeb1c384ceaec4ddc5f70ba29cb8a6089c8c0b03f03f6162a225fcb70c1f31da6b65a7a568fa987e9
-  data.tar.gz: b4dc313ac468f1484d5288c180876878150a4d9628f9a7905fb1851509aa34d54d6ad5361a1c6a203a47c142407e39fdf66b762938f8cb3b711892063fe2943a
+  metadata.gz: 77f888f0178cf42099ed921f9de20843cedcbc2adb9ea313f42236ee90f20497ad515f9a9055809ee19ffa291bf2986f0daaab522ababca288be60a0f3bacd18
+  data.tar.gz: 211a846efc40001fce2ba874e874b9cb5d312873719b379a4aae14e93bae4ab86a90b9d828f1440acae2f16faf0b874c17461d078c48bdc973b5a54797154833

data/.rultor.yml

@@ -2,7 +2,6 @@ assets:
   rubygems.yml: zerocracy/home#assets/rubygems.yml
   id_rsa: zerocracy/home#assets/heroku-key
   id_rsa.pub: zerocracy/home#assets/heroku-key.pub
-  bonus.key: zerocracy/home#assets/zold/bonus.key
 install: |
   sudo apt-get -y update
   sudo gem install pdd
@@ -30,7 +29,6 @@ release:
     git add Gemfile.lock
     git add .gitignore
     git fetch
-    cp ../bonus.key . && git add bonus.key
     git commit -m 'config' && git push -f heroku $(git symbolic-ref --short HEAD):master
     curl -f --connect-timeout 15 --retry 5 --retry-delay 30 http://b1.zold.io > /dev/null
 architect:

data/fixtures/scripts/push-and-pull.sh

@@ -29,8 +29,10 @@ zold taxes debt 0000000000000000
 
 zold remote show
 zold push 0000000000000000
-sleep 2
-zold fetch 0000000000000000 --ignore-score-weakness || echo 'Failed'
+until zold fetch 0000000000000000 --ignore-score-weakness; do
+  echo 'Failed to fetch, let us try again'
+  sleep 1
+done
 zold diff 0000000000000000
 zold merge 0000000000000000
 zold clean 0000000000000000

data/heroku-run.sh

@@ -2,5 +2,4 @@
 
 ./bin/zold node --no-colors --trace \
     --bind-port=$PORT --port=80 --host=b1.zold.io --threads=0 \
-    --invoice=ML5Ern7m@912ecc24b32dbe74 --never-reboot \
-    --bonus-wallet=81c9c25789b03876 --private-key=bonus.key --bonus-amount=1 --bonus-time=60
+    --invoice=ML5Ern7m@912ecc24b32dbe74 --never-reboot

data/lib/zold/commands/fetch.rb

@@ -107,7 +107,7 @@ Available options:"
           raise "Protocol #{wallet.protocol} doesn't match #{Zold::PROTOCOL} in #{id}"
         end
         if wallet.network != opts['network']
-          raise "The wallet #{id} is in network #{wallet.network}, while we are in #{opts['network']}"
+          raise "The wallet #{id} is in network '#{wallet.network}', while we are in '#{opts['network']}'"
         end
         if wallet.balance.negative? && !wallet.root?
           raise "The balance of #{id} is #{wallet.balance} and it's not a root wallet"

data/lib/zold/commands/node.rb

@@ -98,14 +98,6 @@ module Zold
         o.string '--expose-version',
           "The version of the software to expose in JSON (default: #{VERSION})",
           default: VERSION
-        o.string '--bonus-wallet',
-          'The ID of the wallet to regularly send bonuses from (for nodes online)'
-        o.integer '--bonus-time',
-          'The amount of minutes to wait between bonus awards (default: 60)',
-          default: 60
-        o.string '--bonus-amount',
-          'The amount of ZLD to pay to each remote as a bonus',
-          default: '1'
         o.string '--private-key',
           'The location of RSA private key (default: ~/.ssh/id_rsa)',
           default: '~/.ssh/id_rsa'
@@ -173,7 +165,7 @@ module Zold
       SafeEntrance.new(
         AsyncEntrance.new(
           SpreadEntrance.new(
-            Entrance.new(@wallets, @remotes, @copies, address, log: @log),
+            Entrance.new(@wallets, @remotes, @copies, address, log: @log, network: opts['network']),
             @wallets, @remotes, address,
             log: @log,
             ignore_score_weakeness: opts['ignore-score-weakness']
@@ -256,11 +248,7 @@ module Zold
       metronome.add(Routines::Spread.new(opts, @wallets, entrance, log: @log))
       unless opts['standalone']
         require_relative 'routines/reconnect'
-        metronome.add(Routines::Reconnect.new(opts, @remotes, farm, log: @log))
-      end
-      if opts['bonus-wallet']
-        require_relative 'routines/bonuses'
-        metronome.add(Routines::Bonuses.new(opts, @wallets, @remotes, @copies, farm, log: @log))
+        metronome.add(Routines::Reconnect.new(opts, @remotes, farm, log: Log::Quiet.new))
       end
       @log.info('Metronome created')
       metronome

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

@@ -41,10 +41,13 @@ module Zold
 
       def exec(_ = 0)
         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
         end
+        @log.info("Spread #{pushed.count} random wallets out of #{@wallets.all.count}: #{pushed.join}")
       end
     end
   end

data/lib/zold/node/entrance.rb

@@ -35,7 +35,7 @@ require_relative '../commands/push'
 module Zold
   # The entrance
   class Entrance
-    def initialize(wallets, remotes, copies, address, log: Log::Quiet.new)
+    def initialize(wallets, remotes, copies, address, log: Log::Quiet.new, network: 'test')
       raise 'Wallets can\'t be nil' if wallets.nil?
       raise 'Wallets must implement the contract of Wallets: method #find is required' unless wallets.respond_to?(:find)
       @wallets = wallets
@@ -48,6 +48,8 @@ module Zold
       @address = address
       raise 'Log can\'t be nil' if log.nil?
       @log = log
+      raise 'Network can\'t be nil' if network.nil?
+      @network = network
       @history = []
       @mutex = Mutex.new
     end
@@ -74,7 +76,7 @@ module Zold
       unless @remotes.all.empty?
         Fetch.new(
           wallets: @wallets, remotes: @remotes, copies: copies.root, log: @log
-        ).run(['fetch', id.to_s, "--ignore-node=#{@address}"])
+        ).run(['fetch', id.to_s, "--ignore-node=#{@address}", "--network=#{@network}"])
       end
       modified = Merge.new(
         wallets: @wallets, copies: copies.root, log: @log

data/lib/zold/version.rb

@@ -23,6 +23,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION  = '0.14.4'.freeze
+  VERSION  = '0.14.5'.freeze
   PROTOCOL = 2
 end

data/test/commands/test_node.rb

@@ -48,11 +48,16 @@ class TestNode < Minitest::Test
           ['push', '--ignore-score-weakness']
         )
         copies = home.copies(wallet)
-        sleep 2
-        Zold::Fetch.new(
-          wallets: wallets, copies: copies.root,
-          remotes: remotes, log: test_log
-        ).run(['fetch', '--ignore-score-weakness'])
+        begin
+          retries ||= 0
+          Zold::Fetch.new(
+            wallets: wallets, copies: copies.root,
+            remotes: remotes, log: test_log
+          ).run(['fetch', '--ignore-score-weakness'])
+        rescue StandardError => _
+          sleep 1
+          retry if (retries += 1) < 3
+        end
         assert_equal(1, copies.all.count)
         assert_equal('1', copies.all[0][:name])
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.14.5
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -375,7 +375,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
@@ -410,7 +409,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
@@ -496,7 +494,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

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

@@ -1,76 +0,0 @@
-# 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,72 +0,0 @@
-# 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.now, 'fake-node.local', 999, '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