zold 0.16.9 → 0.16.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fa4b6ced7df2e9773120703da57a11e317396caedc756a8b42d9316fb900ff7
-  data.tar.gz: e1e4f91dda7d2954bb7cb34adf5f56b71202ebe59102a7a85a805e4425041be0
+  metadata.gz: 5bdb355d25ef5197cfcc131d383d5391bec683efb8f5db52ba6b60d690bf4e3f
+  data.tar.gz: dc2f83cf4bdbc787de4232aa56fb3570f721f887b93069b4fa766fc0eeee2597
 SHA512:
-  metadata.gz: f5b2ccce4eec666e4036448517f18ee4e36e71637100b85d900536891bf7e04306b5e7fd764037df5616b07998526b472759f9aa873874ffedaa640256217b2f
-  data.tar.gz: 16287fd3da5be69b02e5d3ef232ca18eaa6cd1dafaeafbbe07ec3d4fc98f34e21f23fcd867591b19f5fe18ff6302a66aba3901432d8781fe672c82ef283d2f56
+  metadata.gz: de19e0642f74972e9a28f7506fea7397d51473d7bc308b0da64353e9177cea7c2f16a56f1f0ca537f15f90d8001b6625c9762b9f1294eda20888539dc018c890
+  data.tar.gz: 19275bbdfe0cc8baea050d14656edcacad9b1d87846f4ddd9752f85517c20009515079c46050727bbb843b8448a5bd5feebcf8406584536720f9323c565b5011

data/.rubocop.yml

@@ -5,6 +5,8 @@ AllCops:
   DisplayCopNames: true
   TargetRubyVersion: 2.3.3
 
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
 Metrics/CyclomaticComplexity:
   Max: 25
 Metrics/MethodLength:

data/fixtures/scripts/distribute-wallet.sh

@@ -6,7 +6,7 @@ function start_node {
   cd ${port}
   zold node --trace --invoice=DISTRWALLET@ffffffffffffffff \
     --host=localhost --port=${port} --bind-port=${port} \
-    --threads=0 --routine-immediately > log.txt &
+    --threads=0 --routine-immediately --never-reboot > log.txt &
   pid=$!
   echo ${pid} > pid
   cd ..

data/lib/zold/commands/calculate.rb

@@ -21,8 +21,8 @@
 # SOFTWARE.
 
 require 'slop'
+require 'zold/score'
 require_relative '../log'
-require_relative '../score'
 
 # SCORE command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/lib/zold/commands/clean.rb

@@ -26,12 +26,12 @@ require 'time'
 require 'futex'
 require 'slop'
 require 'rainbow'
+require 'zold/score'
 require_relative 'args'
 require_relative '../age'
 require_relative '../size'
 require_relative '../log'
 require_relative '../http'
-require_relative '../score'
 require_relative '../copies'
 
 # CLEAN command.

data/lib/zold/commands/fetch.rb

@@ -27,12 +27,12 @@ require 'tempfile'
 require 'slop'
 require 'rainbow'
 require 'concurrent/atomics'
+require 'zold/score'
 require_relative 'args'
 require_relative '../log'
 require_relative '../age'
 require_relative '../http'
 require_relative '../size'
-require_relative '../score'
 require_relative '../json_page'
 require_relative '../copies'
 

data/lib/zold/commands/next.rb

@@ -21,8 +21,8 @@
 # SOFTWARE.
 
 require 'slop'
+require 'zold/score'
 require_relative '../log'
-require_relative '../score'
 
 # NEXT command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/lib/zold/commands/node.rb

@@ -24,9 +24,9 @@ require 'open3'
 require 'slop'
 require 'backtrace'
 require 'concurrent'
+require 'zold/score'
 require_relative '../version'
 require_relative '../age'
-require_relative '../score'
 require_relative '../metronome'
 require_relative '../wallet'
 require_relative '../wallets'
@@ -79,8 +79,8 @@ module Zold
           "The strength of the score (default: #{Score::STRENGTH})",
           default: Score::STRENGTH
         o.integer '--threads',
-          "How many threads to use for scores finding (default: #{Concurrent.processor_count})",
-          default: Concurrent.processor_count
+          "How many threads to use for scores finding (default: #{[Concurrent.processor_count, 4].max})",
+          default: [Concurrent.processor_count, 4].max
         o.bool '--dump-errors',
           'Make HTTP front-end errors visible in the log (false by default)',
           default: false

data/lib/zold/commands/push.rb

@@ -95,8 +95,7 @@ total score for #{id} is #{total}")
       response = r.http(uri).put(content)
       @wallets.find(id) do |wallet|
         if response.code == '304'
-          @log.info("#{r}: same version #{Size.new(content.length)} of #{wallet.memo} \
-there, in #{Age.new(start, limit: 0.5)}")
+          @log.info("#{r}: same version of #{wallet.memo} there, in #{Age.new(start, limit: 0.5)}")
           return 0
         end
         r.assert_code(200, response)
@@ -105,8 +104,8 @@ there, in #{Age.new(start, limit: 0.5)}")
         r.assert_valid_score(score)
         r.assert_score_ownership(score)
         r.assert_score_strength(score) unless opts['ignore-score-weakness']
-        @log.info("#{r} accepted #{Size.new(content.length)} of #{wallet.memo} \
-in #{Age.new(start, limit: 4)}: #{Rainbow(score.value).green} (#{json['version']})")
+        @log.info("#{r} accepted #{wallet.memo} in #{Age.new(start, limit: 4)}: \
+#{Rainbow(score.value).green} (#{json['version']})")
         score.value
       end
     end

data/lib/zold/commands/remote.rb

@@ -26,6 +26,7 @@ require 'rainbow'
 require 'net/http'
 require 'json'
 require 'time'
+require 'zold/score'
 require_relative 'args'
 require_relative '../node/farm'
 require_relative '../log'
@@ -33,7 +34,6 @@ require_relative '../age'
 require_relative '../json_page'
 require_relative '../http'
 require_relative '../remotes'
-require_relative '../score'
 require_relative '../wallet'
 require_relative '../gem'
 

data/lib/zold/commands/taxes.rb

@@ -23,11 +23,11 @@
 require 'slop'
 require 'json'
 require 'rainbow'
+require 'zold/score'
 require_relative 'args'
 require_relative 'pay'
 require_relative '../log'
 require_relative '../json_page'
-require_relative '../score'
 require_relative '../id'
 require_relative '../tax'
 require_relative '../http'
@@ -121,13 +121,14 @@ the balance is #{wallet.balance}: #{tax.to_text}")
         @log.debug("No need to pay taxes yet, while the debt is less than #{Tax::TRIAL} (#{Tax::TRIAL.to_i} zents)")
         return
       end
-      top = everybody = top_scores(opts)
+      top = top_scores(opts)
+      everybody = top.dup
       paid = 0
       while debt > Tax::TRIAL
         if top.empty?
           msg = [
             "There were #{everybody.count} remote nodes as tax collecting candidates;",
-            "#{paid} payments have been made",
+            "#{paid} payments have been made;",
             "there was not enough score power to pay the total debt of #{total} for #{wallet.id};",
             "the residual amount to pay is #{debt} (trial amount is #{Tax::TRIAL});",
             "the formula ingredients are #{tax.to_text}"

data/lib/zold/gem.rb

@@ -21,9 +21,9 @@
 # SOFTWARE.
 
 require 'uri'
+require 'zold/score'
 require_relative 'json_page'
 require_relative 'http'
-require_relative 'score'
 
 # Class representing the Zold gem on Rubygems
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -36,6 +36,8 @@ module Zold
       JsonPage.new(
         Http.new(uri: 'https://rubygems.org/api/v1/versions/zold/latest.json', score: Score::ZERO).get.body
       ).to_hash['version']
+    rescue StandardError => _
+      '0.0.0'
     end
   end
 end

data/lib/zold/http.rb

@@ -25,8 +25,8 @@ require 'uri'
 require 'timeout'
 require 'net/http'
 require 'backtrace'
+require 'zold/score'
 require_relative 'version'
-require_relative 'score'
 
 # HTTP page.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/lib/zold/node/farm.rb

@@ -25,8 +25,8 @@ require 'open3'
 require 'backtrace'
 require 'futex'
 require 'json'
+require 'zold/score'
 require_relative '../log'
-require_relative '../score'
 require_relative '../age'
 require_relative '../verbose_thread'
 require_relative 'farmers'
@@ -45,16 +45,32 @@ module Zold
       end
     end
 
+    # Makes an instance of a farm. There should be only farm in the entire
+    # application, but you can, of course, start as many of them as necessary for the
+    # purpose of unit testing.
+    #
+    # <tt>cache</tt> is the file where the farm will keep all the scores it
+    # manages to find. If the file is absent, it will be created, together with
+    # the necesary parent directories.
+    #
+    # <tt>lifetime</tt> is the amount of seconds for a score to live in the farm, by default
+    # it's the entire day, since the Score expires in 24 hours; can be decreased for the
+    # purpose of unit testing.
     def initialize(invoice, cache = File.join(Dir.pwd, 'farm'), log: Log::Quiet.new,
-      farmer: Farmers::Plain.new)
+      farmer: Farmers::Plain.new, lifetime: 24 * 60 * 60)
       @log = log
-      @cache = cache
+      @cache = File.expand_path(cache)
       @invoice = invoice
       @pipeline = Queue.new
       @farmer = farmer
       @threads = []
+      @lifetime = lifetime
     end
 
+    # Returns the list of best scores the farm managed to find up to now. The
+    # list is NEVER empty, even if the farm has just started. If it's empty,
+    # it's definitely a bug. If the farm is just fresh start, the list will
+    # contain a single score with a zero value.
     def best
       load
     end
@@ -62,7 +78,7 @@ module Zold
     def to_text
       [
         "Current time: #{Time.now.utc.iso8601}",
-        "Ruby processes: #{`ps -a | grep zold | wc -l`}",
+        "Ruby processes: #{`ps ax | grep zold | wc -l`}",
         JSON.pretty_generate(to_json),
         @threads.map do |t|
           trace = t.backtrace || []
@@ -87,10 +103,25 @@ module Zold
       }
     end
 
+    # Starts a farm, all threads, and yields the block provided. You are
+    # supposed to use it only with the block:
+    #
+    #  Farm.new.start('example.org', 4096) do |farm|
+    #    score = farm.best[0]
+    #    # Everything else...
+    #  end
+    #
+    # The farm will stop all its threads and close all resources safely
+    # right after the block provided exists.
     def start(host, port, strength: 8, threads: 8)
+      raise 'Block is required for the farm to start' unless block_given?
       @log.info('Zero-threads farm won\'t score anything!') if threads.zero?
+      if best.empty?
+        @log.info("No scores found in cache at #{@cache}")
+      else
+        @log.info("#{best.size} scores pre-loaded from #{@cache}, the best is: #{best[0]}")
+      end
       cleanup(host, port, strength, threads)
-      @log.info("#{@pipeline.size} scores pre-loaded, the best is: #{best[0]}")
       @alive = true
       @threads = (1..threads).map do |t|
         Thread.new do
@@ -108,9 +139,9 @@ module Zold
         Thread.current.abort_on_exception = true
         Thread.current.name = 'cleanup'
         loop do
-          max = 600
-          a = (0..max).take_while do
-            sleep 0.1
+          max = 100
+          a = (0..max - 1).take_while do
+            sleep 0.01
             @alive
           end
           unless a.count == max
@@ -131,7 +162,7 @@ module Zold
         start = Time.now
         finish(@cleanup)
         @threads.each { |t| finish(t) }
-        @log.info("Farm stopped in #{Age.new(start)}")
+        @log.info("Farm stopped in #{Age.new(start)} (threads=#{threads}, strength=#{strength})")
       end
     end
 
@@ -144,7 +175,7 @@ module Zold
       loop do
         delay = Time.now - start
         if thread.join(0.1)
-          @log.info("Thread \"#{thread.name}\" finished in #{Age.new(start)}")
+          @log.info("Thread \"#{thread.name}\" peacefully finished in #{Age.new(start)}")
           break
         end
         if delay > 1
@@ -157,16 +188,13 @@ module Zold
     def cleanup(host, port, strength, threads)
       scores = load
       before = scores.map(&:value).max.to_i
-      save(threads, [Score.new(time: Time.now, host: host, port: port, invoice: @invoice, strength: strength)])
+      save(threads, [Score.new(host: host, port: port, invoice: @invoice, strength: strength)])
       scores = load
-      push(scores)
-      after = scores.map(&:value).max.to_i
-      @log.debug("#{Thread.current.name}: best score is #{scores[0]}") if before != after && !after.zero?
-    end
-
-    def push(scores)
       free = scores.reject { |s| @threads.find { |t| t.name == s.to_mnemo } }
       @pipeline << free[0] if @pipeline.size.zero? && !free.empty?
+      after = scores.map(&:value).max.to_i
+      return unless before != after && !after.zero?
+      @log.debug("#{Thread.current.name}: best score of #{scores.count} is #{scores[0]}")
     end
 
     def cycle(host, port, strength, threads)
@@ -189,14 +217,14 @@ module Zold
       Thread.current.name = s.to_mnemo
       Thread.current.thread_variable_set(:start, Time.now.utc.iso8601)
       score = @farmer.up(s)
-      @log.debug("New score discovered: #{score}")
+      @log.debug("New score discovered: #{score}") if strength > 4
       save(threads, [score])
       cleanup(host, port, strength, threads)
     end
 
     def save(threads, list = [])
       scores = load + list
-      period = 24 * 60 * 60 / [threads, 1].max
+      period = @lifetime / [threads, 1].max
       Futex.new(@cache, log: @log).open do |f|
         IO.write(
           f,
@@ -216,20 +244,18 @@ module Zold
     def load
       Futex.new(@cache, log: @log).open do |f|
         if File.exist?(f)
-          IO.read(f).split(/\n/)
-            .map { |t| parse_score_line(t) }
-            .reject(&:zero?)
+          IO.read(f).split(/\n/).map do |t|
+            begin
+              Score.parse(t)
+            rescue StandardError => e
+              @log.error(Backtrace.new(e).to_s)
+              nil
+            end
+          end.compact
         else
           []
         end
       end
     end
-
-    def parse_score_line(line)
-      Score.parse(line)
-    rescue StandardError => e
-      @log.error(Backtrace.new(e).to_s)
-      Score::ZERO
-    end
   end
 end

data/lib/zold/node/farmers.rb

@@ -22,8 +22,8 @@
 
 require 'open3'
 require 'backtrace'
+require 'zold/score'
 require_relative '../log'
-require_relative '../score'
 require_relative '../age'
 
 # Farmers.

data/lib/zold/node/front.rb

@@ -38,6 +38,7 @@ require_relative '../wallet'
 require_relative '../age'
 require_relative '../copies'
 require_relative '../log'
+require_relative '../tax'
 require_relative '../id'
 require_relative '../http'
 
@@ -298,6 +299,7 @@ in #{Age.new(@start, limit: 1)}")
           '--',
           "Balance: #{wallet.balance.to_zld(8)} ZLD (#{wallet.balance.to_i} zents)",
           "Transactions: #{wallet.txns.count}",
+          "Taxes: #{Tax.new(wallet).paid} paid, the debt is #{Tax.new(wallet).debt}",
           "File size: #{File.size(wallet.path)} bytes (#{Copies.new(File.join(settings.copies, id)).all.count} copies)",
           "Modified: #{wallet.mtime.utc.iso8601} (#{Age.new(wallet.mtime.utc.iso8601)} ago)",
           "Digest: #{wallet.digest}"

data/lib/zold/remotes.rb

@@ -28,8 +28,8 @@ require 'time'
 require 'futex'
 require 'fileutils'
 require 'backtrace'
+require 'zold/score'
 require_relative 'age'
-require_relative 'score'
 require_relative 'http'
 require_relative 'node/farm'
 
@@ -119,7 +119,7 @@ module Zold
       end
     end
 
-    def initialize(file:, network: 'test', timeout: 16)
+    def initialize(file:, network: 'test', timeout: Http::READ_TIMEOUT + Http::CONNECT_TIMEOUT)
       @file = file
       @network = network
       @timeout = timeout
@@ -181,7 +181,6 @@ module Zold
       list = all
       return if list.empty?
       best = farm.best[0]
-      require_relative 'score'
       score = best.nil? ? Score::ZERO : best
       idx = 0
       pool = Concurrent::FixedThreadPool.new([list.count, Concurrent.processor_count * 4].min, max_queue: 0)
@@ -202,7 +201,7 @@ module Zold
             raise 'Took too long to execute' if (Time.now - start).round > @timeout
           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("#{r[:host]}:#{r[:port]}").red}: #{e.message} in #{Age.new(start)}")
             log.debug(Backtrace.new(e).to_s)
             remove(r[:host], r[:port]) if errors > Remotes::TOLERANCE
           end

data/lib/zold/version.rb

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

data/lib/zold/wallet.rb

@@ -72,7 +72,7 @@ module Zold
     end
 
     def memo
-      "#{id}/#{balance.to_zld(4)}/#{txns.count}t/#{digest[0, 6]}/Size.new(File.size(@file))}"
+      "#{id}/#{balance.to_zld(4)}/#{txns.count}t/#{digest[0, 6]}/#{Size.new(File.size(@file))}"
     end
 
     def to_text

data/test/commands/test_fetch.rb

@@ -25,6 +25,7 @@ require 'tmpdir'
 require 'json'
 require 'time'
 require 'webmock/minitest'
+require 'zold/score'
 require_relative '../test__helper'
 require_relative '../fake_home'
 require_relative '../../lib/zold/wallet'
@@ -33,7 +34,6 @@ require_relative '../../lib/zold/remotes'
 require_relative '../../lib/zold/id'
 require_relative '../../lib/zold/copies'
 require_relative '../../lib/zold/key'
-require_relative '../../lib/zold/score'
 require_relative '../../lib/zold/commands/fetch'
 
 # FETCH test.
@@ -44,7 +44,7 @@ class TestFetch < Minitest::Test
   def test_fetches_wallet
     FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
-      stub_request(:get, "http://localhost:80/wallet/#{wallet.id}").to_return(
+      stub_request(:get, "http://localhost:4096/wallet/#{wallet.id}").to_return(
         status: 200,
         body: {
           'score': Zold::Score::ZERO.to_h,
@@ -56,7 +56,7 @@ class TestFetch < Minitest::Test
         status: 404
       )
       remotes = home.remotes
-      remotes.add('localhost', 80)
+      remotes.add('localhost', 4096)
       remotes.add('localhost', 81)
       copies = home.copies(wallet)
       begin

data/test/commands/test_merge.rb

@@ -24,6 +24,7 @@ require 'minitest/autorun'
 require 'tmpdir'
 require 'time'
 require 'webmock/minitest'
+require 'zold/score'
 require_relative '../test__helper'
 require_relative '../fake_home'
 require_relative '../../lib/zold/wallet'
@@ -31,7 +32,6 @@ require_relative '../../lib/zold/wallets'
 require_relative '../../lib/zold/id'
 require_relative '../../lib/zold/copies'
 require_relative '../../lib/zold/key'
-require_relative '../../lib/zold/score'
 require_relative '../../lib/zold/patch'
 require_relative '../../lib/zold/commands/merge'
 require_relative '../../lib/zold/commands/pay'

data/test/commands/test_pull.rb

@@ -36,10 +36,10 @@ class TestPull < Minitest::Test
   def test_pull_wallet
     FakeHome.new(log: test_log).run do |home|
       remotes = home.remotes
-      remotes.add('localhost', 80)
+      remotes.add('localhost', 4096)
       json = home.create_wallet_json
       id = Zold::JsonPage.new(json).to_hash['id']
-      stub_request(:get, "http://localhost:80/wallet/#{id}").to_return(status: 200, body: json)
+      stub_request(:get, "http://localhost:4096/wallet/#{id}").to_return(status: 200, body: json)
       Zold::Pull.new(wallets: home.wallets, remotes: remotes, copies: home.copies.root.to_s, log: test_log).run(
         ['--ignore-this-stupid-option', 'pull', id.to_s]
       )

data/test/commands/test_remote.rb

@@ -23,13 +23,13 @@
 require 'minitest/autorun'
 require 'tmpdir'
 require 'webmock/minitest'
+require 'zold/score'
 require_relative '../test__helper'
 require_relative '../../lib/zold/version'
 require_relative '../../lib/zold/wallets'
 require_relative '../../lib/zold/remotes'
 require_relative '../../lib/zold/key'
 require_relative '../../lib/zold/log'
-require_relative '../../lib/zold/score'
 require_relative '../../lib/zold/commands/remote'
 
 # REMOTE test.
@@ -133,7 +133,7 @@ class TestRemote < Minitest::Test
     Dir.mktmpdir do |dir|
       remotes = Zold::Remotes.new(file: File.join(dir, 'remotes.txt'))
       score = Zold::Score.new(
-        time: Time.now, host: 'aa1.example.org', port: 9999, invoice: 'NOPREFIX4@ffffffffffffffff'
+        host: 'aa1.example.org', port: 9999, invoice: 'NOPREFIX4@ffffffffffffffff'
       )
       stub_request(:get, 'http://localhost:8883/version').to_return(
         status: 200,

data/test/commands/test_taxes.rb

@@ -70,7 +70,7 @@ class TestTaxes < Minitest::Test
       )
       wallet.flush
       assert(tax.paid.positive?, tax.paid)
-      assert_equal(before - debt, wallet.balance)
+      assert_equal((before - debt).to_zld(6), wallet.balance.to_zld(6))
     end
   end
 end

data/test/fake_home.rb

@@ -63,7 +63,7 @@ class FakeHome
   end
 
   def create_wallet_json(id = Zold::Id.new)
-    require_relative '../lib/zold/score'
+    require 'zold/score'
     score = Zold::Score::ZERO
     Dir.mktmpdir 'wallets' do |external_dir|
       wallet = create_wallet(id, external_dir)

data/test/node/test_farm.rb

@@ -49,6 +49,16 @@ class FarmTest < Minitest::Test
     end
   end
 
+  def test_makes_many_scores
+    Dir.mktmpdir do |dir|
+      farm = Zold::Farm.new('NOPREFIX6@ffffffffffffffff', File.join(dir, 'f'),
+        log: test_log, lifetime: 10, farmer: Zold::Farmers::Plain.new)
+      farm.start('localhost', 80, threads: 4, strength: 1) do
+        assert_wait { farm.best.length == 4 }
+      end
+    end
+  end
+
   def test_makes_best_score_in_background
     Dir.mktmpdir do |dir|
       farm = Zold::Farm.new('NOPREFIX1@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
@@ -76,10 +86,12 @@ class FarmTest < Minitest::Test
 
   def test_pre_loads_history
     Dir.mktmpdir do |dir|
-      cache = File.join(dir, 'cache')
+      cache = File.join(dir, 'a/b/c/cache')
       farm = Zold::Farm.new('NOPREFIX3@cccccccccccccccc', cache, log: test_log)
       farm.start('example.com', 8080, threads: 0, strength: 1) do
         score = farm.best[0]
+        assert(!score.nil?, 'The list of best scores can\'t be empty!')
+        assert(File.exist?(cache), 'The cache file has to be created!')
         assert_equal(0, score.value)
         assert(!score.expired?)
         assert_equal('example.com', score.host)

data/test/node/test_farmers.rb

@@ -22,8 +22,8 @@
 
 require 'minitest/autorun'
 require 'time'
+require 'zold/score'
 require_relative '../test__helper'
-require_relative '../../lib/zold/score'
 require_relative '../../lib/zold/node/farmers'
 
 class FarmersTest < Minitest::Test

data/test/node/test_front.rb

@@ -25,13 +25,13 @@ require 'json'
 require 'time'
 require 'securerandom'
 require 'threads'
+require 'zold/score'
 require_relative '../test__helper'
 require_relative 'fake_node'
 require_relative '../fake_home'
 require_relative '../../lib/zold/http'
 require_relative '../../lib/zold/age'
 require_relative '../../lib/zold/json_page'
-require_relative '../../lib/zold/score'
 
 class FrontTest < Minitest::Test
   def app
@@ -96,7 +96,7 @@ class FrontTest < Minitest::Test
   def test_updates_list_of_remotes
     FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
       score = Zold::Score.new(
-        time: Time.now, host: 'localhost', port: port, invoice: 'NOPREFIX@ffffffffffffffff', strength: 1
+        host: 'localhost', port: port, invoice: 'NOPREFIX@ffffffffffffffff', strength: 1
       ).next.next.next.next
       response = Zold::Http.new(uri: "http://localhost:#{port}/remotes", score: score).get
       assert_equal('200', response.code, response.body)
@@ -207,7 +207,7 @@ class FrontTest < Minitest::Test
       '16' => 'https://www.zold.io/images/logo-green.png'
     }.each do |num, path|
       score = Zold::Score.new(
-        time: Time.now, host: 'localhost', port: 999,
+        host: 'localhost', port: 999,
         invoice: 'NOPREFIX@ffffffffffffffff',
         strength: 1
       )

data/test/test_http.rb

@@ -24,8 +24,8 @@ require 'minitest/autorun'
 require 'tmpdir'
 require 'uri'
 require 'webmock/minitest'
+require 'zold/score'
 require_relative '../lib/zold/http'
-require_relative '../lib/zold/score'
 
 # Http test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/test/test_tax.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'zold/score'
 require 'time'
 require_relative 'test__helper'
 require_relative 'fake_home'
@@ -31,7 +32,6 @@ require_relative '../lib/zold/tax'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/amount'
 require_relative '../lib/zold/prefixes'
-require_relative '../lib/zold/score'
 
 # Tax test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -73,7 +73,7 @@ class TestTax < Minitest::Test
         )
       end
       score = Zold::Score.new(
-        time: Time.now, host: 'localhost', port: 80, invoice: 'NOPREFIX@cccccccccccccccc',
+        host: 'localhost', port: 80, invoice: 'NOPREFIX@cccccccccccccccc',
         suffixes: %w[A B C D E F G H I J K L M N O P Q R S T U V]
       )
       tax = Zold::Tax.new(wallet)
@@ -126,7 +126,7 @@ class TestTax < Minitest::Test
       invoice = "#{Zold::Prefixes.new(target).create}@#{target.id}"
       tax = Zold::Tax.new(wallet)
       score = Zold::Score.new(
-        time: Time.now, host: 'localhost', port: 80, invoice: invoice,
+        host: 'localhost', port: 80, invoice: invoice,
         suffixes: %w[A B C D E F G H I J K L M N O P Q R S T U V]
       )
       tax.pay(Zold::Key.new(file: 'fixtures/id_rsa'), score)

data/zold.gemspec

@@ -65,7 +65,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'posix-spawn', '~>0.3'
   s.add_runtime_dependency 'rainbow', '~>3'
   s.add_runtime_dependency 'rake', '~>12' # has to stay here for Heroku
-  s.add_runtime_dependency 'rubocop', '0.58.1' # has to stay here for Heroku
+  s.add_runtime_dependency 'rubocop', '0.60.0' # has to stay here for Heroku
   s.add_runtime_dependency 'rubocop-rspec', '~>1' # has to stay here for Heroku
   s.add_runtime_dependency 'semantic', '~>1'
   s.add_runtime_dependency 'sinatra', '~>2'
@@ -76,6 +76,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'usagewatch_ext', '~>0'
   s.add_runtime_dependency 'xcop', '~>0'
   s.add_runtime_dependency 'zache', '~>0'
+  s.add_runtime_dependency 'zold-score', '~>0'
   s.add_development_dependency 'codecov', '~>0'
   s.add_development_dependency 'minitest', '~>5'
   s.add_development_dependency 'random-port', '~>0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.16.9
+  version: 0.16.10
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.58.1
+        version: 0.60.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.58.1
+        version: 0.60.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +318,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zold-score
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -536,7 +550,6 @@ files:
 - lib/zold/patch.rb
 - lib/zold/prefixes.rb
 - lib/zold/remotes.rb
-- lib/zold/score.rb
 - lib/zold/signature.rb
 - lib/zold/size.rb
 - lib/zold/sync_wallets.rb
@@ -601,7 +614,6 @@ files:
 - test/test_patch.rb
 - test/test_prefixes.rb
 - test/test_remotes.rb
-- test/test_score.rb
 - test/test_signature.rb
 - test/test_size.rb
 - test/test_sync_wallets.rb
@@ -701,7 +713,6 @@ test_files:
 - test/test_patch.rb
 - test/test_prefixes.rb
 - test/test_remotes.rb
-- test/test_score.rb
 - test/test_signature.rb
 - test/test_size.rb
 - test/test_sync_wallets.rb

data/lib/zold/score.rb

@@ -1,203 +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 'openssl'
-require 'time'
-
-# The score.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
-# License:: MIT
-module Zold
-  # Score
-  class Score
-    # Default strength for the entire system, in production mode.
-    STRENGTH = 6
-
-    attr_reader :time, :host, :port, :invoice, :suffixes, :strength, :created
-
-    def initialize(time: Time.now, host:, port:, invoice:, suffixes: [],
-      strength: Score::STRENGTH, created: Time.now)
-      @time = time
-      @host = host
-      @port = port
-      @invoice = invoice
-      @suffixes = suffixes
-      @strength = strength
-      @created = created
-    end
-
-    # The default no-value score.
-    ZERO = Score.new(time: Time.now, host: 'localhost', port: 80, invoice: 'NOPREFIX@ffffffffffffffff')
-
-    def self.parse_json(json)
-      raise "Time in JSON is broken: #{json}" unless json['time'] =~ /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/
-      raise "Host is wrong: #{json}" unless json['host'] =~ /^[0-9a-z\.\-]+$/
-      raise "Port is wrong: #{json}" unless json['port'].is_a?(Integer)
-      raise "Invoice is wrong: #{json}" unless json['invoice'] =~ /^[a-zA-Z0-9]{8,32}@[a-f0-9]{16}$/
-      raise "Suffixes not array: #{json}" unless json['suffixes'].is_a?(Array)
-      Score.new(
-        time: Time.parse(json['time']), host: json['host'],
-        port: json['port'], invoice: json['invoice'], suffixes: json['suffixes'],
-        strength: json['strength']
-      )
-    end
-
-    def self.parse(text)
-      re = Regexp.new(
-        '^' + [
-          '([0-9]+)/(?<strength>[0-9]+):',
-          ' (?<time>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)',
-          ' (?<host>[0-9a-z\.\-]+)',
-          ' (?<port>[0-9]+)',
-          ' (?<invoice>[a-zA-Z0-9]{8,32}@[a-f0-9]{16})',
-          '(?<suffixes>( [a-zA-Z0-9]+)*)'
-        ].join + '$'
-      )
-      m = re.match(text.strip)
-      raise "Invalid score '#{text}', doesn't match: #{re}" if m.nil?
-      Score.new(
-        time: Time.parse(m[:time]), host: m[:host],
-        port: m[:port].to_i, invoice: m[:invoice],
-        suffixes: m[:suffixes].split(' '),
-        strength: m[:strength].to_i
-      )
-    end
-
-    def self.parse_text(text)
-      parts = text.split(' ', 7)
-      Score.new(
-        time: Time.at(parts[1].hex),
-        host: parts[2],
-        port: parts[3].hex,
-        invoice: "#{parts[4]}@#{parts[5]}",
-        suffixes: parts[6] ? parts[6].split(' ') : [],
-        strength: parts[0].to_i
-      )
-    end
-
-    def hash
-      raise 'Score has zero value, there is no hash' if @suffixes.empty?
-      @suffixes.reduce(prefix) do |pfx, suffix|
-        OpenSSL::Digest::SHA256.new("#{pfx} #{suffix}").hexdigest
-      end
-    end
-
-    def to_mnemo
-      "#{value}:#{@time.strftime('%H%M')}"
-    end
-
-    def to_text
-      pfx, bnf = @invoice.split('@')
-      [
-        @strength,
-        @time.to_i.to_s(16),
-        @host,
-        @port.to_s(16),
-        pfx,
-        bnf,
-        @suffixes.join(' ')
-      ].join(' ')
-    end
-
-    def to_s
-      [
-        "#{value}/#{@strength}:",
-        @time.utc.iso8601,
-        @host,
-        @port,
-        @invoice,
-        @suffixes.join(' ')
-      ].join(' ').strip
-    end
-
-    def to_h
-      {
-        value: value,
-        host: @host,
-        port: @port,
-        invoice: @invoice,
-        time: @time.utc.iso8601,
-        suffixes: @suffixes,
-        strength: @strength,
-        hash: value.zero? ? nil : hash,
-        expired: expired?,
-        valid: valid?,
-        age: (age / 60).round,
-        created: @created.utc.iso8601
-      }
-    end
-
-    def reduced(max = 4)
-      Score.new(
-        time: @time, host: @host, port: @port, invoice: @invoice,
-        suffixes: @suffixes[0..[max, suffixes.count].min - 1],
-        strength: @strength
-      )
-    end
-
-    def next
-      raise 'This score is not valid' unless valid?
-      idx = 0
-      loop do
-        suffix = idx.to_s(16)
-        score = Score.new(
-          time: @time, host: @host, port: @port,
-          invoice: @invoice, suffixes: @suffixes + [suffix],
-          strength: @strength
-        )
-        return score if score.valid?
-        if score.expired?
-          return Score.new(
-            time: Time.now, host: @host, port: @port, invoice: @invoice,
-            suffixes: [], strength: @strength
-          )
-        end
-        idx += 1
-      end
-    end
-
-    def age
-      Time.now - @time
-    end
-
-    def expired?(hours = 24)
-      age > hours * 60 * 60
-    end
-
-    def prefix
-      "#{@time.utc.iso8601} #{@host} #{@port} #{@invoice}"
-    end
-
-    def valid?
-      @suffixes.empty? || hash.end_with?('0' * @strength)
-    end
-
-    def value
-      @suffixes.length
-    end
-
-    def zero?
-      equal?(Score::ZERO)
-    end
-  end
-end

data/test/test_score.rb

@@ -1,161 +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 'tmpdir'
-require 'time'
-require_relative 'test__helper'
-require_relative '../lib/zold/score'
-
-# Score test.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
-# License:: MIT
-class TestScore < Minitest::Test
-  def test_reduces_itself
-    score = Zold::Score.new(
-      time: Time.parse('2017-07-19T21:24:51Z'),
-      host: 'localhost', port: 443, invoice: 'NOPREFIX@ffffffffffffffff',
-      suffixes: %w[A B C D E F G]
-    ).reduced(2)
-    assert_equal(2, score.value)
-    assert_equal(64, score.hash.length)
-  end
-
-  def test_drops_to_zero_when_expired
-    score = Zold::Score.new(
-      time: Time.now - 24 * 60 * 60,
-      host: 'some-host', port: 9999, invoice: 'NOPREFIX@ffffffffffffffff',
-      strength: 50
-    ).next
-    assert(score.valid?)
-    assert(!score.expired?)
-    assert_equal(0, score.value)
-  end
-
-  def test_validates_wrong_score
-    score = Zold::Score.new(
-      time: Time.parse('2017-07-19T21:24:51Z'),
-      host: 'localhost', port: 443, invoice: 'NOPREFIX@ffffffffffffffff',
-      suffixes: %w[xxx yyy zzz]
-    )
-    assert_equal(3, score.value)
-    assert(!score.valid?)
-  end
-
-  def test_prints_mnemo
-    score = Zold::Score.new(
-      time: Time.parse('2017-07-19T22:32:51Z'),
-      host: 'localhost', port: 443, invoice: 'NOPREFIX@ffffffffffffffff'
-    )
-    assert_equal('0:2232', score.to_mnemo)
-  end
-
-  def test_prints_and_parses
-    time = Time.now
-    score = Zold::Score.parse(
-      Zold::Score.new(
-        time: time, host: 'localhost', port: 999, invoice: 'NOPREFIX@ffffffffffffffff',
-        strength: 1
-      ).next.next.to_s
-    )
-    assert_equal(2, score.value)
-    assert_equal(score.time.to_s, time.to_s)
-    assert_equal('localhost', score.host)
-    assert_equal(999, score.port)
-  end
-
-  def test_prints_and_parses_text
-    time = Time.now
-    score = Zold::Score.parse_text(
-      Zold::Score.new(
-        time: time, host: 'a.example.com', port: 999, invoice: 'NOPREFIX@ffffffffffffffff',
-        strength: 1
-      ).next.next.next.to_text
-    )
-    assert_equal(3, score.value)
-    assert_equal(score.time.utc.to_s, time.utc.to_s)
-    assert_equal('a.example.com', score.host)
-    assert_equal(999, score.port)
-  end
-
-  def test_prints_and_parses_text_zero_score
-    time = Time.now
-    score = Zold::Score.parse_text(
-      Zold::Score.new(
-        time: time, host: '192.168.0.1', port: 1, invoice: 'NOPREFIX@ffffffffffffffff', suffixes: []
-      ).to_text
-    )
-    assert_equal(0, score.value)
-    assert(!score.expired?)
-  end
-
-  def test_prints_and_parses_zero_score
-    time = Time.now
-    score = Zold::Score.parse(
-      Zold::Score.new(
-        time: time, host: '192.168.0.1', port: 1, invoice: 'NOPREFIX@ffffffffffffffff', suffixes: []
-      ).to_s
-    )
-    assert_equal(0, score.value)
-    assert(!score.expired?)
-  end
-
-  def test_finds_next_score
-    score = Zold::Score.new(
-      time: Time.now, host: 'localhost', port: 443,
-      invoice: 'NOPREFIX@ffffffffffffffff', strength: 2
-    ).next.next.next
-    assert_equal(3, score.value)
-    assert(score.valid?)
-    assert(!score.expired?)
-  end
-
-  def test_dont_expire_correctly
-    score = Zold::Score.new(
-      time: Time.now - 10 * 60 * 60, host: 'localhost', port: 443,
-      invoice: 'NOPREFIX@ffffffffffffffff', strength: 2
-    ).next.next.next
-    assert(!score.expired?)
-  end
-
-  def test_correct_number_of_zeroes
-    score = Zold::Score.new(
-      time: Time.now, host: 'localhost', port: 443,
-      invoice: 'NOPREFIX@ffffffffffffffff', strength: 3
-    ).next
-    assert(score.hash.end_with?('000'))
-  end
-
-  def test_generates_hash_correctly
-    score = Zold::Score.new(
-      time: Time.parse('2018-06-27T06:22:41Z'), host: 'b2.zold.io', port: 4096,
-      invoice: 'THdonv1E@abcdabcdabcdabcd', suffixes: ['3a934b']
-    )
-    assert_equal('c9c72efbf6beeea13408c5e720ec42aec017c11c3db335e05595c03755000000', score.hash)
-    score = Zold::Score.new(
-      time: Time.parse('2018-06-27T06:22:41Z'), host: 'b2.zold.io', port: 4096,
-      invoice: 'THdonv1E@abcdabcdabcdabcd', suffixes: %w[3a934b 1421217]
-    )
-    assert_equal('e04ab4e69f86aa17be1316a52148e7bc3187c6d3df581d885a862d8850000000', score.hash)
-  end
-end