zold 0.23.4 → 0.23.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 238ff4b33fb512cbd78ba812dd4ccf9fa5b6aa956919233d3ee7b5445e813726
-  data.tar.gz: 98f610ea0b6dbd7bade4bc24684e1b8ddaf267394f246eb31c0fc4c6f0c493cf
+  metadata.gz: 8067a4751084cd631f09a99d4ce58f8cae3ee3d7186662bcaae2b871ad4922a5
+  data.tar.gz: d7ca7a6de3956c40b6f1c9a2c0b5512f44ab26737e02725a2b9895e9673b21e1
 SHA512:
-  metadata.gz: 5814292371095a7c0417d9328708b5412bfb4486d87ba9d8eb4ed7bc13ddff099e5270d37ae94f3ba9b20e7feacac7412538cddbb65c813385ec5f3ba37b9024
-  data.tar.gz: f599d92a904277de6026c4233da9b4deca492cb2d38df0e68846a781b41e0d50e86a37c8af067b8da59dd73711deafbed61b1eed17f1198ad3637a13eb294223
+  metadata.gz: a37b34395f2bd295a58ca9a87ed52a1a6b156e3ce5cba27431e597003a067ffc204d6409e955aa6a6590abb3ca66579820f1ebcef4879c712d8090e2465f994f
+  data.tar.gz: 89dee647bf855e393aa19d22790dd76b25903ff84b3513e6118708b3393e74f9e9958f6a704d39e22b4322586ca004bf54597e81826ca6d3b35d3bc7f795d453

data/lib/zold/commands/rebase.rb

@@ -54,9 +54,11 @@ Available options:"
       end
       mine = Args.new(opts, @log).take || return
       list = mine.empty? ? @wallets.all : mine.map { |i| Id.new(i) }
+      modified = []
       list.uniq.each do |id|
-        rebase(id, opts)
+        modified << id if rebase(id, opts)
       end
+      modified
     end
 
     private

data/lib/zold/hungry_wallets.rb

@@ -58,7 +58,7 @@ module Zold
           if @queue.size > 256
             @log.error("Hungry queue is full with #{@queue.size} wallets, can't add #{id}")
           elsif @missed.exists?(id)
-            @log.error("Hungry queue has seen #{id} just #{Age.new(@missed.mtime(id))} and it was not-found")
+            @log.error("Hungry queue has seen #{id} just #{Age.new(@missed.mtime(id))} ago and it was not-found")
           else
             @mutex.synchronize do
               unless @queue.include?(id)

data/lib/zold/node/entrance.rb

@@ -83,11 +83,11 @@ module Zold
       ).run(['merge', id.to_s])
       Clean.new(wallets: @wallets, copies: copies.root, log: @log).run(['clean', id.to_s])
       copies.remove(localhost, Remotes::PORT)
+      modified += Rebase.new(wallets: @wallets, log: @log).run(['rebase', id.to_s])
       if modified.empty?
         @log.info("Accepted #{id} in #{Age.new(start, limit: 1)} and not modified anything")
       else
         @log.info("Accepted #{id} in #{Age.new(start, limit: 1)} and modified #{modified.join(', ')}")
-        Rebase.new(wallets: @wallets, log: @log).run(['rebase'] + modified.map(&:to_s))
       end
       sec = (Time.now - start).round(2)
       @mutex.synchronize do

data/lib/zold/version.rb

@@ -25,7 +25,7 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.23.4'
+  VERSION = '0.23.5'
   PROTOCOL = 2
   REPO = 'zold-io/zold'
 end

data/test/node/test_entrance.rb

@@ -55,7 +55,7 @@ class TestEntrance < Zold::Test
       target = home.create_wallet(tid)
       e = Zold::Entrance.new(home.wallets, home.remotes, home.copies(source).root, 'x', log: test_log)
       modified = e.push(source.id, body)
-      assert_equal(2, modified.count)
+      assert_equal(3, modified.count)
       assert_equal(Zold::Amount.new(zld: -19.99), source.balance)
       assert_equal(Zold::Amount.new(zld: 19.99), target.balance)
       assert(modified.include?(sid))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.23.4
+  version: 0.23.5
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -753,7 +753,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.23.4!
+  Thanks for installing Zold 0.23.5!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try ZLD online wallet at: https://wts.zold.io