zold 0.14.50 → 0.14.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c93f5cab672e8cda8e44e15b589f97d593486c089f4428487370835207087b00
-  data.tar.gz: 5a14a57fcf20345a21acb27086042dac6cb7df2abfb5b226bae85d6014cc9899
+  metadata.gz: 53fed8a92732a47d8473dd93dcfccf0cc5aac6cd2dad450068779d3faabc8849
+  data.tar.gz: 6eb21513a8b304eb81ad3ef3d46f8c8d802aa0be3b409e06bdadaf5c6021ee88
 SHA512:
-  metadata.gz: 8f4ac2585a5eaf88260243cdad9326eaee19a8a5c7db6689a3bd0a1fd9ba69d466aa95a390f4937ec9ae3fa916c5cb72214a9d4d20ae563e9e4c2d65ff41e018
-  data.tar.gz: 992a00ef00711065ee79e191b3a1ac40d96c70e3074331298484a5a90f5f27170925c5420cac43b617aaabdc1a3712c5729a4d2ff452923faeec3e797c2a89bb
+  metadata.gz: 86cee566355856078b67b2f90f150458158f24a3e5d1681c580c86227dbdffac875c01377e3b69987dca088ed026351a623d02a1f51e653fbfb1ee1b8bd7372f
+  data.tar.gz: 55d61bc63a682151a23a35098449c5798f4ba783101ec8d609a0511cb0462c4f1344e9c191e4b53ae2093c1c576463438c247afea8ef84c72afd6785556f263d

data/lib/zold/commands/propagate.rb

@@ -63,9 +63,14 @@ Available options:"
     def propagate(id, _)
       start = Time.now
       modified = []
+      total = 0
       @wallets.find(id) do |wallet|
         wallet.txns.select { |t| t.amount.negative? }.each do |t|
-          next if t.bnf == id
+          total += 1
+          if t.bnf == id
+            @log.error("Paying itself in #{id}? #{t}")
+            next
+          end
           @wallets.find(t.bnf) do |target|
             unless target.exists?
               @log.debug("#{t.amount * -1} to #{t.bnf}: wallet is absent")
@@ -75,7 +80,7 @@ Available options:"
               @log.error("#{t.amount * -1} to #{t.bnf}: network mismatch, '#{target.network}'!='#{wallet.network}'")
               next
             end
-            next if target.has?(t.id, id)
+            next if target.includes_positive?(t.id, id)
             unless target.prefix?(t.prefix)
               @log.error("#{t.amount * -1} to #{t.bnf}: wrong prefix")
               next
@@ -87,7 +92,8 @@ Available options:"
         end
       end
       modified.uniq!
-      @log.debug("Wallet #{id} propagated successfully in #{Age.new(start)}, #{modified.count} wallets affected")
+      @log.debug("Wallet #{id} propagated successfully, #{total} txns in #{Age.new(start)}, \
+#{modified.count} wallets affected")
       modified
     end
   end

data/lib/zold/patch.rb

@@ -105,7 +105,7 @@ module Zold
             @log.error("Paying wallet file is absent: #{txn.to_text}")
             next
           end
-          unless @wallets.find(txn.bnf) { |p| p.has?(txn.id, wallet.id) }
+          unless @wallets.find(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
             @log.error("Paying wallet #{txn.bnf} doesn't have transaction ##{txn.id} \
 among #{payer.txns.count} transactions: #{txn.to_text}")
             next

data/lib/zold/version.rb

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

data/lib/zold/wallet.rb

@@ -130,18 +130,28 @@ module Zold
 
     def add(txn)
       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 && t.amount.negative? && txn.amount.negative? }
       raise "Wallet #{id} can't pay itself: #{txn}" if txn.bnf == id
-      raise "The transaction with the same ID and BNF already exists in #{id}: #{dup}" unless dup.nil?
+      raise "The amount can't be zero in #{id}: #{txn}" if txn.amount.zero?
+      if txn.amount.negative? && includes_negative?(txn.id)
+        raise "Negative transaction with the same ID #{txn.id} already exists in #{id}"
+      end
+      if txn.amount.positive? && includes_positive?(txn.id, txn.bnf)
+        raise "Positive transaction with the same ID #{txn.id} and BNF #{txn.bnf} already exists in #{id}"
+      end
       raise "The tax payment already exists in #{id}: #{txn}" if Tax.new(self).exists?(txn.details)
       File.open(@file, 'a') { |f| f.print "#{txn}\n" }
       @txns.flush
     end
 
-    def has?(id, bnf)
+    def includes_negative?(id, bnf = nil)
+      raise 'The txn ID has to be of type Integer' unless id.is_a?(Integer)
+      !txns.find { |t| t.id == id && (bnf.nil? || t.bnf == bnf) && t.amount.negative? }.nil?
+    end
+
+    def includes_positive?(id, bnf)
       raise 'The txn ID has to be of type Integer' unless id.is_a?(Integer)
       raise 'The bnf has to be of type Id' unless bnf.is_a?(Id)
-      !txns.find { |t| t.id == id && t.bnf == bnf }.nil?
+      !txns.find { |t| t.id == id && t.bnf == bnf && !t.amount.negative? }.nil?
     end
 
     def prefix?(prefix)

data/test/test_wallet.rb

@@ -79,10 +79,29 @@ class TestWallet < Minitest::Test
       id = Zold::Id.new
       wallet.sub(amount, "NOPREFIX@#{id}", key)
       wallet.add(Zold::Txn.new(1, Time.now, amount, 'NOPREFIX', id, '-'))
+      assert_raises do
+        wallet.add(Zold::Txn.new(1, Time.now, amount, 'NOPREFIX', id, '-'))
+      end
+      assert_raises do
+        wallet.add(Zold::Txn.new(1, Time.now, amount * -1, 'NOPREFIX', id, '-'))
+      end
       assert(wallet.balance.zero?)
     end
   end
 
+  def test_checks_similar_transaction
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      amount = Zold::Amount.new(zld: 39.99)
+      key = Zold::Key.new(file: 'fixtures/id_rsa')
+      id = Zold::Id.new
+      wallet.sub(amount, "NOPREFIX@#{id}", key)
+      wallet.add(Zold::Txn.new(1, Time.now, amount, 'NOPREFIX', id, '-'))
+      assert(wallet.includes_negative?(1))
+      assert(wallet.includes_positive?(1, id))
+    end
+  end
+
   def test_refurbishes_wallet
     FakeHome.new.run do |home|
       wallet = home.create_wallet

metadata

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