zold 0.14.43 → 0.14.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d3d3cbafabdb79387b1ea775c412ed345fce48b8ec09f105b9470b98c463c98
-  data.tar.gz: 38a2639c5918fe32722b7f4b75257645452ccb267ff4f418421bdb913bf68801
+  metadata.gz: 15f35aaff14857e15ecdb5e4c702711250f214f92eb1328e02a574ec9b8bd553
+  data.tar.gz: d7e082ffa042e988a17c57e41ff491070c0660a488fe5996daf8aca1d7b1aec0
 SHA512:
-  metadata.gz: c6307a75f3d546103a4f07bc5ee0a98518e7ba4246982a2495ecea94b208a7fd05795c7b79ac9ea72a52650da81f1c1a795eff094c68345106f5f73e121a446e
-  data.tar.gz: ac69c5944e3d9dbaa1947108feb9fe0a67a310bf391ae7ae16daecb4b11162150d30f5919c2ffd16faa07d01cda57d05339036ee9bfbe38ada753ed46487209b
+  metadata.gz: 989f7648468a8288a5429b059c4b7015c332c00f056230030ecc8b41ed1691053660bbf1714e16cd4def078e6102fb6775d5dd28c44a15e7ae3d71c7ec5f2986
+  data.tar.gz: 59e60d9116b5695ec7b8bc41b43f8cd1fc6621aba6dd53af2a82f139974d788bfc2e6bf22d39653c477c41ad65bef26fdcd27eea19d7959929ea4fd00b12e515

data/lib/zold/age.rb

@@ -37,7 +37,9 @@ module Zold
     def to_s
       return '?' if @time.nil?
       sec = Time.now - @time
-      if sec < 60
+      if sec < 1
+        "#{(sec * 1000).round}ms"
+      elsif sec < 60
         "#{sec.round(2)}s"
       elsif sec < 60 * 60
         "#{(sec / 60).round}m"

data/lib/zold/commands/fetch.rb

@@ -88,7 +88,7 @@ Available options:"
       end
       raise "There are no remote nodes, run 'zold remote reset'" if nodes.value.zero?
       raise "No nodes out of #{nodes.value} have the wallet #{id}" if done.value.zero? && !opts['quiet-if-absent']
-      @log.info("#{done.value} copies of #{id} fetched in #{(Time.now - start).round}s with the total score of \
+      @log.info("#{done.value} copies of #{id} fetched in #{Age.new(start)} with the total score of \
 #{total.value} from #{nodes.value} nodes")
       @log.debug("#{cps.all.count} local copies:")
       cps.all.each do |c|
@@ -130,7 +130,7 @@ Available options:"
         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/\
 #{digest(json)}/#{Age.new(json['mtime'])}/#{json['copies']}c \
-as copy #{copy} of #{id} in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green} (#{json['version']})")
+as copy #{copy} of #{id} in #{Age.new(start)}: #{Rainbow(score.value).green} (#{json['version']})")
       end
       score.value
     end

data/lib/zold/commands/merge.rb

@@ -24,6 +24,7 @@ require 'slop'
 require 'rainbow'
 require_relative 'args'
 require_relative '../backtrace'
+require_relative '../age'
 require_relative '../log'
 require_relative '../id'
 require_relative '../wallet'
@@ -72,20 +73,22 @@ Available options:"
       score = 0
       cps.each_with_index do |c, idx|
         wallet = Wallet.new(c[:path])
-        merge_one(opts, patch, wallet, "#{c[:name]}/#{idx}/#{c[:score]}")
+        name = "#{c[:name]}/#{idx}/#{c[:score]}"
+        merge_one(opts, patch, wallet, name)
         score += c[:score]
       end
       @wallets.find(id) do |wallet|
+        start = Time.now
         if wallet.exists?
           merge_one(opts, patch, wallet, 'localhost')
-          @log.debug("Local copy of #{id} merged: #{patch}")
+          @log.debug("Local copy of #{id} merged in #{Age.new(start)}: #{patch}")
         else
           @log.debug("Local copy of #{id} is absent, nothing to merge")
         end
         modified = patch.save(wallet.path, overwrite: true)
         if modified
           @log.info("#{cps.count} copies with the total score of #{score} successfully merged \
-into #{wallet.id}/#{wallet.balance}/#{wallet.txns.count}t")
+into #{wallet.id}/#{wallet.balance}/#{wallet.txns.count}t in #{Age.new(start)}")
         else
           @log.info("Nothing changed in #{wallet.id} after merge of #{cps.count} copies")
         end
@@ -94,9 +97,10 @@ into #{wallet.id}/#{wallet.balance}/#{wallet.txns.count}t")
     end
 
     def merge_one(opts, patch, wallet, name)
+      start = Time.now
       @log.debug("Building a patch for #{wallet.id} from remote copy #{name}...")
       patch.join(wallet, !opts['no-baseline'])
-      @log.debug("Copy #{name} of #{wallet.id} merged: #{patch}")
+      @log.debug("Copy #{name} of #{wallet.id} merged in #{Age.new(start)}: #{patch}")
     rescue StandardError => e
       @log.error("Can't merge copy #{name}: #{e.message}")
       @log.debug(Backtrace.new(e).to_s)

data/lib/zold/commands/node.rb

@@ -23,6 +23,7 @@
 require 'open3'
 require 'slop'
 require_relative '../version'
+require_relative '../age'
 require_relative '../score'
 require_relative '../backtrace'
 require_relative '../metronome'
@@ -264,8 +265,7 @@ module Zold
         end
         nohup_log.print("Nothing else left to read from ##{thr.pid}\n")
         code = thr.value.to_i
-        nohup_log.print("Exit code of process ##{thr.pid} is #{code}, was alive for \
-#{((Time.now - start) / 60).round} min: #{cmd}\n")
+        nohup_log.print("Exit code of process ##{thr.pid} is #{code}, was alive for #{Age.new(start)}: #{cmd}\n")
         code
       end
     end

data/lib/zold/commands/propagate.rb

@@ -24,6 +24,7 @@ require 'slop'
 require 'rainbow'
 require_relative 'args'
 require_relative '../log'
+require_relative '../age'
 require_relative '../wallet'
 require_relative '../wallets'
 require_relative '../prefixes'
@@ -60,6 +61,7 @@ Available options:"
 
     # Returns list of Wallet IDs which were affected
     def propagate(id, _)
+      start = Time.now
       modified = []
       @wallets.find(id) do |wallet|
         wallet.txns.select { |t| t.amount.negative? }.each do |t|
@@ -85,7 +87,7 @@ Available options:"
         end
       end
       modified.uniq!
-      @log.debug("Wallet #{id} propagated successfully, #{modified.count} wallets affected")
+      @log.debug("Wallet #{id} propagated successfully in #{Age.new(start)}, #{modified.count} wallets affected")
       modified
     end
   end

data/lib/zold/commands/push.rb

@@ -25,6 +25,7 @@ require 'slop'
 require 'json'
 require 'net/http'
 require_relative 'args'
+require_relative '../age'
 require_relative '../log'
 require_relative '../id'
 require_relative '../http'
@@ -77,7 +78,7 @@ Available options:"
       end
       raise "There are no remote nodes, run 'zold remote reset'" if nodes.zero?
       raise "No nodes out of #{nodes} accepted the wallet #{id}" if done.zero?
-      @log.info("Push finished to #{done} nodes out of #{nodes} in #{(Time.now - start).round}s, \
+      @log.info("Push finished to #{done} nodes out of #{nodes} in #{Age.new(start)}, \
 total score for #{id} is #{total}")
     end
 
@@ -96,7 +97,7 @@ total score for #{id} is #{total}")
       @wallets.find(id) do |wallet|
         if response.code == '304'
           @log.info("#{r}: same version #{content.length}b/#{wallet.txns.count}t \
-of #{wallet.id} there, in #{(Time.now - start).round(2)}s")
+of #{wallet.id} there, in #{Age.new(start)}")
           return 0
         end
         r.assert_code(200, response)
@@ -106,7 +107,7 @@ of #{wallet.id} there, in #{(Time.now - start).round(2)}s")
         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 #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green} (#{json['version']})")
+in #{Age.new(start)}: #{Rainbow(score.value).green} (#{json['version']})")
         score.value
       end
     end

data/lib/zold/commands/remote.rb

@@ -29,6 +29,7 @@ require 'time'
 require_relative 'args'
 require_relative '../node/farm'
 require_relative '../log'
+require_relative '../age'
 require_relative '../json_page'
 require_relative '../http'
 require_relative '../remotes'
@@ -244,8 +245,7 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
           end
         end
         capacity << { host: score.host, port: score.port, count: json['all'].count }
-        @log.info("#{r}: the score is #{Rainbow(score.value).green} (#{json['version']}) \
-in #{(Time.now - start).round(2)}s")
+        @log.info("#{r}: the score is #{Rainbow(score.value).green} (#{json['version']}) in #{Age.new(start)}")
       end
       max_capacity = capacity.map { |c| c[:count] }.max || 0
       capacity.each do |c|

data/lib/zold/metronome.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require_relative 'log'
+require_relative 'age'
 require_relative 'verbose_thread'
 require_relative 'backtrace'
 
@@ -60,10 +61,10 @@ module Zold
             start = Time.now
             begin
               r.exec(step)
-              @log.info("Routine #{r.class.name} ##{step} done in #{(Time.now - start).round(2)}s")
+              @log.info("Routine #{r.class.name} ##{step} done in #{Age.new(start)}")
             rescue StandardError => e
               @failures[r.class.name] = Backtrace.new(e).to_s
-              @log.error("Routine #{r.class.name} ##{step} failed in #{(Time.now - start).round(2)}s")
+              @log.error("Routine #{r.class.name} ##{step} failed in #{Age.new(start)}")
               @log.error(Backtrace.new(e).to_s)
             end
             step += 1
@@ -80,13 +81,13 @@ module Zold
         @threads.each do |t|
           tstart = Time.now
           if t.join(60)
-            @log.info("Thread #{t.name} finished in #{(Time.now - tstart).round(2)}s")
+            @log.info("Thread #{t.name} finished in #{Age.new(tstart)}")
           else
             t.exit
-            @log.info("Thread #{t.name} killed in #{(Time.now - tstart).round(2)}s")
+            @log.info("Thread #{t.name} killed in #{Age.new(tstart)}")
           end
         end
-        @log.info("Metronome stopped in #{(Time.now - start).round(2)}s, #{@failures.count} failures")
+        @log.info("Metronome stopped in #{Age.new(start)}, #{@failures.count} failures")
       end
     end
   end

data/lib/zold/node/async_entrance.rb

@@ -22,6 +22,7 @@
 
 require 'concurrent'
 require_relative '../log'
+require_relative '../age'
 require_relative '../id'
 require_relative '../verbose_thread'
 
@@ -117,7 +118,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 #{(Time.now - start).round}s")
+      @log.debug("Pushed #{id}/#{body.length}b to #{@entrance.class.name} in #{Age.new(start)}")
     end
 
     def queue

data/lib/zold/node/farm.rb

@@ -24,6 +24,7 @@ require 'time'
 require 'open3'
 require_relative '../log'
 require_relative '../score'
+require_relative '../age'
 require_relative '../verbose_thread'
 require_relative '../backtrace'
 require_relative '../atomic_file'
@@ -118,7 +119,7 @@ module Zold
         start = Time.now
         finish(@cleanup)
         @threads.each { |t| finish(t) }
-        @log.info("Farm stopped in #{(Time.now - start).round(2)}s")
+        @log.info("Farm stopped in #{Age.new(start)}")
       end
     end
 
@@ -129,14 +130,14 @@ module Zold
       @alive = false
       @log.info("Attempting to terminate the thread \"#{thread.name}\"...")
       loop do
-        delay = (Time.now - start).round(2)
+        delay = Time.now - start
         if thread.join(0.1)
-          @log.info("Thread \"#{thread.name}\" finished in #{delay}s")
+          @log.info("Thread \"#{thread.name}\" finished in #{Age.new(start)}")
           break
         end
         if delay > 10
           thread.exit
-          @log.error("Thread \"#{thread.name}\" forcefully terminated after #{delay}s")
+          @log.error("Thread \"#{thread.name}\" forcefully terminated after #{Age.new(start)}")
         end
       end
     end

data/lib/zold/patch.rb

@@ -123,7 +123,11 @@ among #{payer.txns.count} transactions: #{txn.to_text}")
       before = AtomicFile.new(file).read if File.exist?(file)
       wallet = Wallet.new(file)
       wallet.init(@id, @key, overwrite: overwrite, network: @network)
-      @txns.each { |t| wallet.add(t) }
+      File.open(file, 'a') do |f|
+        @txns.each do |txn|
+          f.print "#{txn}\n"
+        end
+      end
       wallet.refurbish
       after = AtomicFile.new(file).read
       before != after

data/lib/zold/remotes.rb

@@ -27,6 +27,7 @@ require 'net/http'
 require 'time'
 require 'fileutils'
 require_relative 'backtrace'
+require_relative 'age'
 require_relative 'score'
 require_relative 'http'
 require_relative 'node/farm'
@@ -100,7 +101,7 @@ module Zold
 
       def assert_valid_score(score)
         raise "Invalid score #{score}" unless score.valid?
-        raise "Expired score #{score}" if score.expired?
+        raise "Expired score (#{Age.new(score.time)}) #{score}" if score.expired?
       end
 
       def assert_score_ownership(score)
@@ -197,8 +198,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 #{(Time.now - start).round}s")
+            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.14.43'
+  VERSION = '0.14.44'
   PROTOCOL = 2
 end

data/lib/zold/wallet.rb

@@ -54,7 +54,7 @@ module Zold
     EXTENSION = '.z'
 
     def initialize(file)
-      @file = File.extname(file).empty? ? "#{file}#{EXTENSION}" : file
+      @file = File.absolute_path(File.extname(file).empty? ? "#{file}#{EXTENSION}" : file)
       @txns = Txns::Cached.new(Txns.new(@file))
       @head = Head::Cached.new(Head.new(@file))
     end

data/test/node/test_front.rb

@@ -28,6 +28,7 @@ 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'
 
@@ -209,8 +210,7 @@ class FrontTest < Minitest::Test
         Zold::Http.new(uri: URI("http://localhost:#{port}/"), score: nil).get
       end
     end
-    sec = (Time.now - start) / total
-    test_log.info("Average response time is #{sec.round(2)}s")
+    test_log.info("Average response time is #{Zold::Age.new(start)}")
   end
 
   def app

data/test/test__helper.rb

@@ -53,7 +53,7 @@ module Minitest
         end
         sleep 1
         sec = Time.now - start
-        raise "'#{actual}' is not equal to '#{expected}' even after #{sec.round}s of waiting" if sec > max
+        raise "'#{actual}' is not equal to '#{expected}' even after #{Age.new(start)} of waiting" if sec > max
       end
     end
 

data/test/test_remotes.rb

@@ -25,6 +25,7 @@ require 'tmpdir'
 require 'webmock/minitest'
 require_relative 'test__helper'
 require_relative '../lib/zold/log'
+require_relative '../lib/zold/age'
 require_relative '../lib/zold/remotes'
 require_relative '../lib/zold/verbose_thread'
 
@@ -218,7 +219,7 @@ class TestRemotes < Minitest::Test
         remotes.iterate(test_log) { remotes.all }
         remotes.remove('127.0.0.1', 8080 + t)
       end
-      test_log.info("Total time: #{Time.now - start}")
+      test_log.info("Total time: #{Zold::Age.new(start)}")
     end
   end
 

data/test/test_wallet.rb

@@ -23,6 +23,7 @@
 require 'minitest/autorun'
 require_relative 'fake_home'
 require_relative '../lib/zold/key'
+require_relative '../lib/zold/age'
 require_relative '../lib/zold/id'
 require_relative '../lib/zold/wallet'
 require_relative '../lib/zold/txn'
@@ -51,7 +52,7 @@ class TestWallet < Minitest::Test
       wallet.txns
       wallet.sub(Zold::Amount.new(zld: 39.99), "NOPREFIX@#{Zold::Id.new}", key)
       time = Time.now - start
-      assert(time < 0.5, "Too slow: #{time.round(2)} seconds")
+      assert(time < 0.5, "Too slow: #{Zold::Age.new(start)} seconds")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.43
+  version: 0.14.44
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-10 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cachy