zold 0.14.44 → 0.14.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15f35aaff14857e15ecdb5e4c702711250f214f92eb1328e02a574ec9b8bd553
-  data.tar.gz: d7e082ffa042e988a17c57e41ff491070c0660a488fe5996daf8aca1d7b1aec0
+  metadata.gz: 3dc091e61d283ef577ce87d8820b39688a07c57f628992f566ed3fd73845c536
+  data.tar.gz: b521a547e508f4b3d562ab0c166baf686cfca29879c25366bf46325e91e156c0
 SHA512:
-  metadata.gz: 989f7648468a8288a5429b059c4b7015c332c00f056230030ecc8b41ed1691053660bbf1714e16cd4def078e6102fb6775d5dd28c44a15e7ae3d71c7ec5f2986
-  data.tar.gz: 59e60d9116b5695ec7b8bc41b43f8cd1fc6621aba6dd53af2a82f139974d788bfc2e6bf22d39653c477c41ad65bef26fdcd27eea19d7959929ea4fd00b12e515
+  metadata.gz: c54c68946531a91b6087f7cfaf311dc0b11f7e20fcf0b6e053792c7d525bb608759f18cbbac16811ae35aa6d0ba79add1ba66848c3b070937d24356370d47437
+  data.tar.gz: ce085d811af804213af2efbd8ced6bec1afa62127fdd3d83c5d0d4463b515bcaad0687037109a6a1770ff7c8c8f4e9c4745a01cf57a6ff628d45963e803d7aaf

data/lib/zold/age.rb

@@ -22,7 +22,7 @@
 
 require 'time'
 
-# Age
+# Age in seconds.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
@@ -30,8 +30,7 @@ module Zold
   # Age
   class Age
     def initialize(time)
-      @time = time
-      @time = Time.parse(@time) unless time.is_a?(Time)
+      @time = time.nil? || time.is_a?(Time) ? time : Time.parse(time)
     end
 
     def to_s

data/lib/zold/amount.rb

@@ -69,7 +69,7 @@ module Zold
     end
 
     def ==(other)
-      raise '== may only work with Amount' unless other.is_a?(Amount)
+      raise "== may only work with Amount: #{other}" unless other.is_a?(Amount)
       @coins == other.to_i
     end
 

data/lib/zold/commands/clean.rb

@@ -27,6 +27,7 @@ require 'slop'
 require 'rainbow'
 require_relative 'args'
 require_relative '../age'
+require_relative '../size'
 require_relative '../log'
 require_relative '../http'
 require_relative '../score'
@@ -64,7 +65,7 @@ Available options:"
       cps.all.each do |c|
         wallet = Wallet.new(c[:path])
         @log.debug("  #{c[:name]}: #{c[:score]} #{wallet.balance}/#{wallet.txns.count}t/\
-#{wallet.digest[0, 6]}/#{File.size(c[:path])}b/#{Age.new(File.mtime(c[:path]))}")
+#{wallet.digest[0, 6]}/#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}")
       end
     end
   end

data/lib/zold/commands/fetch.rb

@@ -31,6 +31,7 @@ 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'
@@ -94,7 +95,7 @@ Available options:"
       cps.all.each do |c|
         wallet = Wallet.new(c[:path])
         @log.debug("  #{c[:name]}: #{c[:score]} #{wallet.balance}/#{wallet.txns.count}t/\
-#{wallet.digest[0, 6]}/#{File.size(c[:path])}b/#{Age.new(File.mtime(c[:path]))}")
+#{wallet.digest[0, 6]}/#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}")
       end
     end
 
@@ -128,7 +129,7 @@ Available options:"
           raise "The balance of #{id} is #{wallet.balance} and it's not a root wallet"
         end
         copy = cps.add(File.read(f), score.host, score.port, score.value)
-        @log.info("#{r} returned #{body.length}b/#{wallet.balance}/#{wallet.txns.count}t/\
+        @log.info("#{r} returned #{Size.new(body.length)}/#{wallet.balance}/#{wallet.txns.count}t/\
 #{digest(json)}/#{Age.new(json['mtime'])}/#{json['copies']}c \
 as copy #{copy} of #{id} in #{Age.new(start)}: #{Rainbow(score.value).green} (#{json['version']})")
       end

data/lib/zold/commands/push.rb

@@ -26,6 +26,7 @@ require 'json'
 require 'net/http'
 require_relative 'args'
 require_relative '../age'
+require_relative '../size'
 require_relative '../log'
 require_relative '../id'
 require_relative '../http'
@@ -96,7 +97,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 #{content.length}b/#{wallet.txns.count}t \
+          @log.info("#{r}: same version #{Size.new(content.length)}/#{wallet.txns.count}t \
 of #{wallet.id} there, in #{Age.new(start)}")
           return 0
         end
@@ -106,8 +107,8 @@ of #{wallet.id} there, in #{Age.new(start)}")
         r.assert_valid_score(score)
         r.assert_score_ownership(score)
         r.assert_score_strength(score) unless opts['ignore-score-weakness']
-        @log.info("#{r} accepted #{content.length}b/#{wallet.digest[0, 6]}/#{wallet.txns.count}t of #{wallet.id} \
-in #{Age.new(start)}: #{Rainbow(score.value).green} (#{json['version']})")
+        @log.info("#{r} accepted #{Size.new(content.length)}/#{wallet.digest[0, 6]}/#{wallet.txns.count}t \
+of #{wallet.id} in #{Age.new(start)}: #{Rainbow(score.value).green} (#{json['version']})")
         score.value
       end
     end

data/lib/zold/commands/taxes.rb

@@ -72,6 +72,9 @@ Available options:"
           'The location of RSA private key (default: ~/.ssh/id_rsa)',
           require: true,
           default: '~/.ssh/id_rsa'
+        o.bool '--ignore-score-weakness',
+          'Don\'t complain when their score is too weak',
+          default: false
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
@@ -114,13 +117,12 @@ Available options:"
         @log.debug("No need to pay taxes yet, until the debt is less than #{Tax::TRIAL} (#{Tax::TRIAL.to_i} zents)")
         return
       end
-      top = top_scores
-      while debt > Amount::ZERO
+      top = top_scores(opts)
+      while debt > Tax::TRIAL
         raise 'No acceptable remote nodes, try later' if top.empty?
         best = top.shift
         txn = tax.pay(Zold::Key.new(file: opts['private-key']), best)
-        wallet.add(txn)
-        debt -= txn.amount
+        debt += txn.amount
         @log.info("#{txn.amount} of taxes paid to #{txn.bnf}, #{debt} left to pay")
       end
       @log.info('The wallet is in good standing, all taxes paid')
@@ -136,7 +138,7 @@ Available options:"
       raise 'Not implemented yet'
     end
 
-    def top_scores
+    def top_scores(opts)
       best = []
       @remotes.iterate(@log) do |r|
         uri = '/'
@@ -145,7 +147,7 @@ Available options:"
         json = JsonPage.new(res.body, uri).to_hash
         score = Score.parse_json(json['score'])
         r.assert_valid_score(score)
-        r.assert_score_strength(score)
+        r.assert_score_strength(score) unless opts['ignore-score-weakness']
         r.assert_score_value(score, Tax::EXACT_SCORE)
         @log.info("#{r}: #{Rainbow(score.value).green}")
         best << score

data/lib/zold/copies.rb

@@ -24,6 +24,7 @@ require 'time'
 require 'csv'
 require_relative 'atomic_file'
 require_relative 'log'
+require_relative 'size'
 require_relative 'wallet'
 require_relative 'backtrace'
 
@@ -64,7 +65,7 @@ module Zold
           file = File.join(@dir, f)
           size = File.size(file)
           File.delete(file)
-          @log.debug("Copy at #{f} deleted: #{size}b")
+          @log.debug("Copy at #{f} deleted: #{Size.new(size)}")
           deleted += 1
         end
         files.each do |f|

data/lib/zold/node/async_entrance.rb

@@ -23,6 +23,7 @@
 require 'concurrent'
 require_relative '../log'
 require_relative '../age'
+require_relative '../size'
 require_relative '../id'
 require_relative '../verbose_thread'
 
@@ -118,7 +119,7 @@ module Zold
       return if id.empty? || body.empty?
       start = Time.now
       @entrance.push(Id.new(id), body)
-      @log.debug("Pushed #{id}/#{body.length}b to #{@entrance.class.name} in #{Age.new(start)}")
+      @log.debug("Pushed #{id}/#{Size.new(body.length)} to #{@entrance.class.name} in #{Age.new(start)}")
     end
 
     def queue

data/lib/zold/node/front.rb

@@ -33,6 +33,7 @@ require 'usagewatch_ext'
 require 'concurrent'
 require_relative '../backtrace'
 require_relative '../version'
+require_relative '../size'
 require_relative '../wallet'
 require_relative '../copies'
 require_relative '../log'
@@ -314,7 +315,7 @@ while #{settings.address} is in '#{settings.network}'"
         copies.all.map do |c|
           w = Wallet.new(c[:path])
           "#{c[:name]}: #{c[:score]} #{w.balance}/#{w.txns.count}t/\
-#{w.digest[0, 6]}/#{File.size(c[:path])}b/#{Age.new(File.mtime(c[:path]))}"
+#{w.digest[0, 6]}/#{Size.new(File.size(c[:path]))}/#{Age.new(File.mtime(c[:path]))}"
         end.join("\n")
       end
     end

data/lib/zold/node/nodup_entrance.rb

@@ -22,6 +22,7 @@
 
 require 'tempfile'
 require_relative '../log'
+require_relative '../size'
 require_relative '../wallet'
 require_relative '../atomic_file'
 
@@ -63,10 +64,14 @@ module Zold
           w.exists? ? AtomicFile.new(w.path).read.to_s : ''
         end
         if before == after
-          @log.info("Duplicate of #{id}/#{wallet.digest[0, 6]}/#{after.length}b/#{wallet.txns.count}t ignored")
+          @log.info(
+            "Duplicate of #{id}/#{wallet.digest[0, 6]}/#{Size.new(after.length)}/#{wallet.txns.count}t ignored"
+          )
           return []
         end
-        @log.info("New content for #{id} arrived, #{before.length}b before and #{after.length}b after")
+        @log.info(
+          "New content for #{id} arrived, #{Size.new(before.length)} before and #{Size.new(after.length)} after"
+        )
         @entrance.push(id, body)
       end
     end

data/lib/zold/score.rb

@@ -34,7 +34,7 @@ module Zold
     # Default strength for the entire system, in production mode.
     STRENGTH = 6
 
-    attribute :time, Types::Strict::Time
+    attribute :time, Types::Strict::Time.optional.default(Time.now)
     attribute :host, Types::Strict::String.constrained(
       format: /^[a-z0-9\.-]+$/
     )

data/lib/zold/size.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 'time'
+
+# Size in bytes.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Size
+  class Size
+    def initialize(bytes)
+      @bytes = bytes
+    end
+
+    def to_s
+      return '?' if @bytes.nil?
+      if @bytes < 1024
+        "#{@bytes}b"
+      elsif @bytes < 1024 * 1024
+        "#{(@bytes / 1024).round}Kb"
+      elsif @bytes < 1024 * 1024 * 1024
+        "#{(@bytes / (1024 * 1024)).round}Mb"
+      else
+        "#{(@bytes / (1024 * 1024 * 1024)).round}Gb"
+      end
+    end
+  end
+end

data/lib/zold/tax.rb

@@ -67,8 +67,7 @@ module Zold
     end
 
     def pay(pvt, best)
-      fee = Tax::FEE_TXN_HOUR * @wallet.txns.count * Tax::DAYS_INCREMENT * 24
-      @wallet.sub(fee, best.invoice, pvt, details(best))
+      @wallet.sub(Tax::MAX_PAYMENT, best.invoice, pvt, details(best))
     end
 
     def in_debt?

data/lib/zold/version.rb

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

data/lib/zold/wallet.rb

@@ -132,8 +132,8 @@ module Zold
       raise 'The txn has to be of type Txn' unless txn.is_a?(Txn)
       dup = txns.find { |t| t.bnf == txn.bnf && t.id == txn.id }
       raise "Wallet #{id} can't pay itself: #{txn}" if txn.bnf == id
-      raise "The transaction with the same ID and BNF already exists: #{dup}" unless dup.nil?
-      raise "The tax payment already exists: #{txn}" if Tax.new(self).exists?(txn)
+      raise "The transaction with the same ID and BNF already exists in #{id}: #{dup}" unless dup.nil?
+      raise "The tax payment already exists in #{id}: #{txn}" if Tax.new(self).exists?(txn)
       File.open(@file, 'a') { |f| f.print "#{txn}\n" }
       @txns.flush
     end

data/test/commands/test_taxes.rb

@@ -44,24 +44,25 @@ class TestTaxes < Minitest::Test
       wallet.add(
         Zold::Txn.new(
           1,
-          Time.now - 24 * 60 * 60 * 365 * 20,
+          Time.now - 24 * 60 * 60 * 365 * 300,
           Zold::Amount.new(zld: 19.99),
           'NOPREFIX', Zold::Id.new, '-'
         )
       )
       remotes = home.remotes
-      zero = Zold::Score::ZERO
-      remotes.add(zero.host, zero.port)
-      stub_request(:get, "http://#{zero.host}:#{zero.port}/").to_return(
+      score = Zold::Score.new(host: 'localhost', port: 80, strength: 1, invoice: 'NOPREFIX@0000000000000000')
+      Zold::Tax::EXACT_SCORE.times { score = score.next }
+      remotes.add(score.host, score.port)
+      stub_request(:get, "http://#{score.host}:#{score.port}/").to_return(
         status: 200,
         body: {
-          score: zero.to_h
+          score: score.to_h
         }.to_json
       )
-      Zold::Taxes.new(
-        wallets: wallets, remotes: remotes, log: test_log
-      ).run(['taxes', '--private-key=fixtures/id_rsa', wallet.id.to_s])
-      assert_equal(Zold::Amount.new(coins: 85_856_396_247), wallet.balance)
+      Zold::Taxes.new(wallets: wallets, remotes: remotes, log: test_log).run(
+        ['taxes', '--private-key=fixtures/id_rsa', '--ignore-score-weakness', 'pay', wallet.id.to_s]
+      )
+      assert_equal(Zold::Amount.new(coins: 81_561_428_951), wallet.balance)
     end
   end
 end

data/test/test_age.rb

@@ -0,0 +1,37 @@
+# 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 '../lib/zold/age'
+
+# Age test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestAge < Minitest::Test
+  def test_prints_age
+    assert_equal('10m', Zold::Age.new(Time.now - 10 * 60).to_s)
+    assert_equal('5.5s', Zold::Age.new(Time.now - 5.5).to_s)
+    assert_equal('?', Zold::Age.new(nil).to_s)
+    assert(!Zold::Age.new(Time.now.utc.iso8601).to_s.nil?)
+  end
+end

data/test/test_size.rb

@@ -0,0 +1,38 @@
+# 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 '../lib/zold/size'
+
+# Size test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestSize < Minitest::Test
+  def test_prints_size
+    assert_equal('?', Zold::Size.new(nil).to_s)
+    assert_equal('10b', Zold::Size.new(10).to_s)
+    assert_equal('2Kb', Zold::Size.new(2 * 1024).to_s)
+    assert_equal('9Mb', Zold::Size.new(9 * 1024 * 1024).to_s)
+    assert_equal('7Gb', Zold::Size.new(7 * 1024 * 1024 * 1024).to_s)
+  end
+end

data/test/test_tax.rb

@@ -78,7 +78,7 @@ class TestTax < Minitest::Test
       )
       tax = Zold::Tax.new(wallet)
       txn = tax.pay(Zold::Key.new(file: 'fixtures/id_rsa'), score)
-      assert_equal(-88_243_200, txn.amount.to_i)
+      assert_equal(Zold::Tax::MAX_PAYMENT * -1, txn.amount)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.44
+  version: 0.14.45
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -525,6 +525,7 @@ files:
 - lib/zold/remotes.rb
 - lib/zold/score.rb
 - lib/zold/signature.rb
+- lib/zold/size.rb
 - lib/zold/sync_wallets.rb
 - lib/zold/tax.rb
 - lib/zold/tree_wallets.rb
@@ -571,6 +572,7 @@ files:
 - test/node/test_sync_entrance.rb
 - test/node/test_trace.rb
 - test/test__helper.rb
+- test/test_age.rb
 - test/test_amount.rb
 - test/test_atomic_file.rb
 - test/test_backtrace.rb
@@ -587,6 +589,7 @@ files:
 - test/test_remotes.rb
 - test/test_score.rb
 - test/test_signature.rb
+- test/test_size.rb
 - test/test_sync_wallets.rb
 - test/test_tax.rb
 - test/test_tree_wallets.rb
@@ -667,6 +670,7 @@ test_files:
 - test/node/test_sync_entrance.rb
 - test/node/test_trace.rb
 - test/test__helper.rb
+- test/test_age.rb
 - test/test_amount.rb
 - test/test_atomic_file.rb
 - test/test_backtrace.rb
@@ -683,6 +687,7 @@ test_files:
 - test/test_remotes.rb
 - test/test_score.rb
 - test/test_signature.rb
+- test/test_size.rb
 - test/test_sync_wallets.rb
 - test/test_tax.rb
 - test/test_tree_wallets.rb