zold 0.13.35 → 0.13.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d72a17dead59c9ae473afc46355b7189dccde252
-  data.tar.gz: cd9e2182faaae9ef62448e099bbe836246832fef
+  metadata.gz: e23be41e6c8dadef6629a272c916ccee80df3f3b
+  data.tar.gz: '08289f098335807fc9c20d51c8a3d594a55fe556'
 SHA512:
-  metadata.gz: c2e3e6e3d3d34fc1f0442397efbf4fceb6b269d8d7b4099cf46a70c130beb4f35fe53d2397c63d4032576d1fd10d3e448835e808a7b79149c1d364de06fc8b24
-  data.tar.gz: 2b8283cb8e7d7661cf002f24b6430dae1c5c1ec1ab522c02f1ef650aef425dfe24383f9fc7c80132d676ba9510154698bd6b82040b8eac92d5104906524c255f
+  metadata.gz: 485792e64292fefdb142042688ee14c4dff2cec23b38342a93b0cefc0a60fc81d5f4a61eb1609412ed5adfa0457ef7947831b8c4e6fafbba78ce105b8a880b59
+  data.tar.gz: 15d0813c27821df32484ea4b34c48c6ad70cd6a750fd450e61fa22c5ee5a3816c3c900f6992e09400c6ff23b1c5f73f5fac8db32fcd4510303047870b411dbfb

data/lib/zold/patch.rb

@@ -69,7 +69,7 @@ module Zold
             @log.error("Transaction ID is not greater than max ID #{max}: #{txn.to_text}")
             next
           end
-          dup = @txns.find { |t| t.id == txn.id }
+          dup = @txns.find { |t| t.id == txn.id && t.amount.negative? }
           if dup
             @log.error("An attempt to overwrite #{dup.to_text} with this: #{txn.to_text}")
             next

data/lib/zold/remotes.rb

@@ -173,9 +173,9 @@ module Zold
       best = farm.best[0]
       require_relative 'score'
       score = best.nil? ? Score::ZERO : best
-      start = Time.now
       idx = 0
       all.each do |r|
+        start = Time.now
         begin
           yield Remotes::Remote.new(r[:host], r[:port], score, idx, log: log, network: @network)
           idx += 1

data/lib/zold/version.rb

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

data/test/test_patch.rb

@@ -87,4 +87,21 @@ class TestPatch < Minitest::Test
       assert_equal(amount * -1, first.balance)
     end
   end
+
+  def test_merges_similar_ids_but_different_signs
+    FakeHome.new.run do |home|
+      first = home.create_wallet(Zold::Id::ROOT)
+      second = home.create_wallet
+      File.write(second.path, File.read(first.path))
+      key = Zold::Key.new(file: 'fixtures/id_rsa')
+      second.sub(Zold::Amount.new(zld: 7.0), "NOPREFIX@#{Zold::Id.new}", key)
+      first.add(Zold::Txn.new(1, Time.now, Zold::Amount.new(zld: 9.0), 'NOPREFIX', Zold::Id.new, 'fake'))
+      patch = Zold::Patch.new(home.wallets, log: test_log)
+      patch.join(first)
+      patch.join(second)
+      FileUtils.rm(first.path)
+      assert_equal(true, patch.save(first.path))
+      assert_equal(Zold::Amount.new(zld: 2.0), first.balance)
+    end
+  end
 end

metadata

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