zold 0.13.44 → 0.13.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf5190e58996ff52177172576009917026da5136
-  data.tar.gz: 7f0ce81b3a4ae8b21eb835cd6eb2d0e6aecd2aee
+  metadata.gz: 622dc23ea0837dff3dd0dfefb7fb14cf2dadc7b7
+  data.tar.gz: a41c3ecde8b70c7d91ba87750122d7ec4183818f
 SHA512:
-  metadata.gz: a8e5c2b7ed530521fc5d3f8bda21b3f547a3a8757e3e4fa083be4b1cbf3cb59e793514d8ea85feb3f4a195e0e398312956bc7b7fa5b0c0f1587250d61a278bfd
-  data.tar.gz: a64b280273fcfae4bccf039b01419450065757cc8d3de53e88435864f3f026b6c2f49778c2d5b9dbe3565172681906a893fc4c3adfb04b3eee77675daef0a276
+  metadata.gz: 0f570ce49f29485a9651c48ede80cab98cd270d2a750f4ec02570ee0886dad62be9e0f4444d45f582b210c6ae2b87a6ec9a9dfc4486696bf09101c55d16700cf
+  data.tar.gz: d8b64b55bfe0f04daa6830b4246a3d50f7a6277c15de193148b8a52fccee0c461d17ca2754090116c654b835be12b70f3a120010807725382e2c6c42fb007419

data/lib/zold/commands/merge.rb

@@ -65,10 +65,6 @@ Available options:"
     private
 
     def merge(id, cps, opts)
-      if cps.all.empty?
-        @log.error("There are no remote copies of #{id}, try 'zold fetch' first")
-        return
-      end
       cps = cps.all.sort_by { |c| c[:score] }.reverse
       patch = Patch.new(@wallets, log: @log)
       cps.each do |c|

data/lib/zold/node/async_entrance.rb

@@ -39,8 +39,8 @@ module Zold
     def start
       @entrance.start do
         @pool = Concurrent::FixedThreadPool.new(
-          Concurrent.processor_count,
-          max_queue: Concurrent.processor_count * 10,
+          Concurrent.processor_count * 8,
+          max_queue: Concurrent.processor_count * 32,
           fallback_policy: :abort
         )
         begin

data/lib/zold/node/entrance.rb

@@ -89,7 +89,8 @@ module Zold
       end
       @mutex.synchronize do
         @history.shift if @history.length > 16
-        @history << "#{id}/#{sec}/#{modified.count}"
+        wallet = @wallets.find(id)
+        @history << "#{id}/#{sec}/#{modified.count}/#{wallet.balance.to_zld}/#{wallet.txns.count}t"
       end
       modified
     end

data/lib/zold/node/front.rb

@@ -181,7 +181,11 @@ module Zold
         wallet.id.to_s,
         wallet.key.to_s,
         '',
-        wallet.txns.map(&:to_text).join("\n")
+        wallet.txns.map(&:to_text).join("\n"),
+        '',
+        '--',
+        'Balance: ' + wallet.balance,
+        'Transactions: ' + wallet.txns.count
       ].join("\n")
     end
 

data/lib/zold/remotes.rb

@@ -234,7 +234,7 @@ in #{(Time.now - start).round}s; errors=#{errors}")
           }
         end
         raw.reject { |r| !r[:host] || r[:port].zero? }.map do |r|
-          r[:home] = URI("http://#{r[0]}:#{r[1]}/")
+          r[:home] = URI("http://#{r[:host]}:#{r[:port]}/")
           r
         end
       end

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.13.44'.freeze
+  VERSION = '0.13.45'.freeze
 end

data/test/commands/test_merge.rb

@@ -123,6 +123,18 @@ class TestMerge < Minitest::Test
     end
   end
 
+  def test_removes_negative_fakes
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      key = Zold::Key.new(file: 'fixtures/id_rsa')
+      wallet.sub(Zold::Amount.new(zld: 9.99), "NOPREFIX@#{Zold::Id.new}", key)
+      Zold::Merge.new(wallets: home.wallets, copies: home.copies.root, log: test_log).run(
+        ['merge', wallet.id.to_s, '--no-baseline']
+      )
+      assert_equal(Zold::Amount::ZERO, wallet.balance)
+    end
+  end
+
   def test_merges_scenarios
     base = 'fixtures/merge'
     Dir.new(base).select { |f| File.directory?(File.join(base, f)) && !f.start_with?('.') }.each do |f|

data/test/test_remotes.rb

@@ -118,10 +118,11 @@ class TestRemotes < Minitest::Test
       file = File.join(dir, 'remotes')
       FileUtils.touch(file)
       remotes = Zold::Remotes.new(file)
-      remotes.add('127.0.0.1', 80)
-      remotes.rescore('127.0.0.1', 80, 15)
+      remotes.add('127.0.0.1', 1024)
+      remotes.rescore('127.0.0.1', 1024, 15)
       remotes.all.each do |r|
         assert_equal(15, r[:score])
+        assert_equal('http://127.0.0.1:1024/', r[:home].to_s)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.13.44
+  version: 0.13.45
 platform: ruby
 authors:
 - Yegor Bugayenko