zold 0.14.22 → 0.14.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1349198ae31f7ea254f40483c00e6f0bcc151933
-  data.tar.gz: 98293d01a30c67585ffae271f12521749bfd2c29
+  metadata.gz: e655198a8ea3c0a9138c5f9b9d2659163cf5a64a
+  data.tar.gz: 6439cd7caedd7c330fe7290a5287dcd0c47d789c
 SHA512:
-  metadata.gz: 223a08a21b6c7709751192614a1a5eac38ca348f16f879bc3fa1d12321108cf594bff151a5a6d11f5778f52c3d64c0e871c600d6e1a02a29caebc5525d551cf6
-  data.tar.gz: 0e9398811135a57a1aa31b3a4d2ee490e2223f4d05e11bbfc3b1fc019e99d0b7417dd84bbcdb5d06b270dd62d2b804c1a01f94c7acbd77e7c1b08d7cf06238f4
+  metadata.gz: ac548ed4b690c03c0bcf84c1961faff7c6460d8af7e677619a5ef15049f460767cf911bdef2c2512964f4bf70ffacf1872e23a8647dd3eaa8a1d3e2592667eb5
+  data.tar.gz: d278d016675843be28fa12df17c2958bdbf07fbc46e283aa3fd6a6e1fe922deb7893e28035c66578b57e98fbfa7b5ab65530fc94fb6940616cd610078520c884

data/lib/zold/tax.rb

@@ -48,7 +48,7 @@ module Zold
     TRIAL = Amount.new(zld: 1.0)
 
     # For how many days to pay at once.
-    DAYS_INCREMENT = 32
+    DAYS_INCREMENT = 64
 
     # Text prefix for taxes details
     PREFIX = 'TAXES'
@@ -86,7 +86,7 @@ module Zold
         next if t.amount > Tax::MAX_PAYMENT
         t
       end.reject(&:nil?).uniq(&:details)
-      paid = scored.empty? ? Amount::ZERO : scored.map(&:amount).inject(&:+) * -1
+      paid = scored.empty? ? Amount::ZERO : scored.map(&:amount).inject(&:+)
       owned = Tax::FEE_TXN_HOUR * txns.count * @wallet.age
       owned - paid
     end

data/lib/zold/version.rb

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

data/lib/zold/wallet.rb

@@ -161,7 +161,7 @@ module Zold
     # Age of wallet in hours
     def age
       list = txns
-      list.empty? ? 0 : (Time.now - list.min_by(&:date).date) / 60
+      list.empty? ? 0 : (Time.now - list.min_by(&:date).date) / (60 * 60)
     end
 
     def txns

data/test/commands/test_remote.rb

@@ -94,12 +94,14 @@ class TestRemote < Minitest::Test
   def test_remote_trim_with_tolerate
     Dir.mktmpdir do |dir|
       remotes = Zold::Remotes.new(file: File.join(dir, 'remotes.txt'))
-      zero = Zold::Score::ZERO
-      stub_request(:get, "http://#{zero.host}:#{zero.port}/remotes").to_return(
+      score = Zold::Score.new(
+        time: Time.now, host: 'aa1.example.org', port: 9999, invoice: 'NOPREFIX4@ffffffffffffffff'
+      )
+      stub_request(:get, "http://#{score.host}:#{score.port}/remotes").to_return(
         status: 200,
         body: {
           version: Zold::VERSION,
-          score: zero.to_h,
+          score: score.to_h,
           all: [
             { host: 'localhost', port: 8883 }
           ]
@@ -109,7 +111,7 @@ class TestRemote < Minitest::Test
       cmd = Zold::Remote.new(remotes: remotes, log: test_log)
       cmd.run(%w[remote clean])
       assert(remotes.all.empty?)
-      cmd.run(['remote', 'add', zero.host, zero.port.to_s, '--skip-ping'])
+      cmd.run(['remote', 'add', score.host, score.port.to_s, '--skip-ping'])
       cmd.run(['remote', 'update', '--ignore-score-weakness', '--skip-ping'])
       assert_equal(2, remotes.all.count)
       cmd.run(['remote', 'update', '--ignore-score-weakness'])

data/test/test_tax.rb

@@ -54,29 +54,49 @@ class TestTax < Minitest::Test
         )
       )
       tax = Zold::Tax.new(wallet)
-      assert(tax.debt > Zold::Amount.new(coins: 1_006_523_000))
-      assert(tax.debt < Zold::Amount.new(coins: 1_006_524_999))
+      assert(tax.debt > Zold::Amount.new(coins: 16_770_000))
+      assert(tax.debt < Zold::Amount.new(coins: 16_790_000))
     end
   end
 
   def test_calculates_debt
     FakeHome.new.run do |home|
       wallet = home.create_wallet
-      wallet.add(
-        Zold::Txn.new(
-          1,
-          Time.now - 24 * 60 * 60 * 365,
-          Zold::Amount.new(zld: 19.99),
-          'NOPREFIX', Zold::Id.new, '-'
+      (1..30).each do |i|
+        wallet.add(
+          Zold::Txn.new(
+            i + 1,
+            Time.now - 24 * 60 * 60 * 365 * 10,
+            Zold::Amount.new(zld: i.to_f),
+            'NOPREFIX', Zold::Id.new, '-'
+          )
         )
-      )
+      end
       score = Zold::Score.new(
         time: Time.now, host: 'localhost', port: 80, invoice: 'NOPREFIX@cccccccccccccccc',
         suffixes: %w[A B C D E F G H I J K L M N O P Q R S T U V]
       )
       tax = Zold::Tax.new(wallet)
-      tax.pay(Zold::Key.new(file: 'fixtures/id_rsa'), score)
-      assert(tax.debt > Zold::Amount::ZERO)
+      txn = tax.pay(Zold::Key.new(file: 'fixtures/id_rsa'), score)
+      assert_equal(-88_243_200, txn.amount.to_i)
+    end
+  end
+
+  def test_takes_tax_payment_into_account
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      wallet.add(
+        Zold::Txn.new(
+          1,
+          Time.now,
+          Zold::Amount.new(coins: 95_596_800),
+          'NOPREFIX', Zold::Id.new('912ecc24b32dbe74'),
+          "TAXES 6 5b5a21a9 b2.zold.io 1000 DCexx0hG 912ecc24b32dbe74 \
+386d4a ec9eae 306e3d 119d073 1c00dba 1376703 203589 5b55f7"
+        )
+      )
+      tax = Zold::Tax.new(wallet)
+      assert(tax.debt < Zold::Amount::ZERO)
     end
   end
 

data/test/test_wallet.rb

@@ -109,6 +109,22 @@ class TestWallet < Minitest::Test
     end
   end
 
+  def test_calculates_wallet_age_in_hours
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      hours = 100
+      wallet.add(
+        Zold::Txn.new(
+          1,
+          Time.now - 100 * 60 * 60,
+          Zold::Amount.new(zld: 1.99),
+          'NOPREFIX', Zold::Id.new, '-'
+        )
+      )
+      assert_equal(hours, wallet.age.round)
+    end
+  end
+
   def test_returns_modified_time
     FakeHome.new.run do |home|
       wallet = home.create_wallet

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.22
+  version: 0.14.23
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2018-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby