zold 0.6.3 → 0.6.4

data/lib/zold/remotes.rb

@@ -44,9 +44,9 @@ module Zold
 
     def all
       list = load
-      max_score = list.map { |r| r[:score] }.max
+      max_score = list.map { |r| r[:score] }.max || 0
       max_score = 1 if max_score.zero?
-      max_errors = list.map { |r| r[:errors] }.max
+      max_errors = list.map { |r| r[:errors] }.max || 0
       max_errors = 1 if max_errors.zero?
       list.sort_by do |r|
         (1 - r[:errors] / max_errors) * 5 + (r[:score] / max_score)

data/lib/zold/tax.rb

@@ -34,6 +34,9 @@ module Zold
     # The minimum score a wallet can buy in order to pay taxes.
     MIN_SCORE = 16
 
+    # The maximum allowed amount in one transaction.
+    MAX_PAYMENT = Amount.new(zld: 1.0)
+
     # This is how much we charge per one transaction per hour
     # of storage. A wallet of 4096 transactions will pay
     # approximately 16ZLD per year.
@@ -57,20 +60,15 @@ module Zold
 
     def debt
       txns = @wallet.txns
-      return Amount::ZERO if txns.empty?
-      paid = txns.map do |t|
+      scores = txns.map do |t|
         pfx, body = t.details.split(' ')
-        if pfx != 'TAXES' || body.nil?
-          Amount::ZERO
-        else
-          score = Score.parse_text(body)
-          if score.valid? && score.value >= MIN_SCORE
-            t.amount
-          else
-            Amount::ZERO
-          end
-        end
-      end.inject(&:+) * -1
+        next if pfx != 'TAXES' || body.nil?
+        score = Score.parse_text(body)
+        next if !score.valid? || score.value < MIN_SCORE
+        next if t.amount > Tax::MAX_PAYMENT
+        score
+      end.reject(&:nil?).uniq(&:hash)
+      paid = scores.empty? ? Amount::ZERO : scores.map(&:amount).inject(&:+) * -1
       age_hours = (Time.now - txns.sort_by(&:date)[0].date) / 60
       owned = Tax::FEE_TXN_HOUR * txns.count * age_hours
       owned - paid

data/lib/zold/txn.rb

@@ -20,6 +20,7 @@
 
 require 'time'
 require_relative 'id'
+require_relative 'hexnum'
 require_relative 'amount'
 require_relative 'signature'
 
@@ -65,9 +66,9 @@ module Zold
 
     def to_s
       [
-        @id,
+        Hexnum.new(@id, 4).to_s,
         @date.utc.iso8601,
-        @amount.to_i,
+        Hexnum.new(@amount.to_i, 16),
         @prefix,
         @bnf,
         @details,
@@ -95,11 +96,11 @@ module Zold
     def self.parse(line, idx = 0)
       regex = Regexp.new(
         '^' + [
-          '([0-9]+)',
+          '([0-9a-f]{4})',
           '([0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)',
-          '(-?[0-9]+)',
+          '([0-9a-f]{16})',
           '([A-Za-z0-9]{8,32})',
-          '([a-f0-9]{16})',
+          '([0-9a-f]{16})',
           '([a-zA-Z0-9 -\.,]{1,128})',
           '([A-Za-z0-9+/]+={0,3})?'
         ].join(';') + '$'
@@ -108,9 +109,9 @@ module Zold
       raise "Invalid line ##{idx}: #{line.inspect}" unless regex.match(clean)
       parts = clean.split(';')
       txn = Txn.new(
-        parts[0].to_i,
+        Hexnum.parse(parts[0]).to_i,
         Time.parse(parts[1]),
-        Amount.new(coins: parts[2].to_i),
+        Amount.new(coins: Hexnum.parse(parts[2]).to_i),
         parts[3],
         Id.new(parts[4]),
         parts[5]

data/lib/zold/version.rb

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

data/lib/zold/wallets.rb

@@ -37,6 +37,7 @@ module Zold
       File.expand_path(@dir)
     end
 
+    # Returns the list of their IDs (as plain text)
     def all
       Dir.new(path).select do |f|
         file = File.join(@dir, f)

data/test/commands/test_diff.rb

@@ -55,7 +55,7 @@ class TestDiff < Minitest::Test
         wallets: Zold::Wallets.new(dir),
         copies: copies.root
       ).run(['diff', id.to_s])
-      assert(diff.include?('-1;'))
+      assert(diff.include?('-0001;'))
     end
   end
 end

data/test/commands/test_pay.rb

@@ -33,16 +33,18 @@ require_relative '../../lib/zold/commands/pay'
 class TestPay < Minitest::Test
   def test_sends_from_wallet_to_wallet
     Dir.mktmpdir 'test' do |dir|
-      id = Zold::Id.new
       wallets = Zold::Wallets.new(dir)
-      source = wallets.find(id)
-      source.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      target = Zold::Id.new
+      sid = Zold::Id.new
+      source = wallets.find(sid)
+      source.init(sid, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+      tid = Zold::Id.new
+      target = wallets.find(tid)
+      target.init(tid, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
       amount = Zold::Amount.new(zld: 14.95)
       Zold::Pay.new(wallets: wallets).run(
         [
           'pay', '--force', '--private-key=fixtures/id_rsa',
-          id.to_s, target.to_s, amount.to_zld, 'For the car'
+          sid.to_s, tid.to_s, amount.to_zld, 'For the car'
         ]
       )
       assert_equal(amount * -1, source.balance)

data/test/commands/test_push.rb

@@ -0,0 +1,52 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require 'tmpdir'
+require 'json'
+require 'time'
+require 'webmock/minitest'
+require_relative '../../lib/zold/wallet'
+require_relative '../../lib/zold/wallets'
+require_relative '../../lib/zold/remotes'
+require_relative '../../lib/zold/id'
+require_relative '../../lib/zold/key'
+require_relative '../../lib/zold/commands/push'
+
+# PUSH test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestPush < Minitest::Test
+  def test_pushes_wallet
+    Dir.mktmpdir 'test' do |dir|
+      id = Zold::Id.new
+      wallets = Zold::Wallets.new(dir)
+      wallet = wallets.find(id)
+      wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+      remotes = Zold::Remotes.new(File.join(dir, 'remotes.csv'))
+      remotes.clean
+      stub_request(:put, "http://fake-1/wallet/#{id}").to_return(status: 304)
+      Zold::Push.new(wallets: wallets, remotes: remotes).run(
+        ['--ignore-this-stupid-option', 'push', id.to_s]
+      )
+    end
+  end
+end

data/test/test_hexnum.rb

@@ -0,0 +1,34 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require_relative '../lib/zold/hexnum'
+
+# Hexnum test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestHexnum < Minitest::Test
+  def test_prints_and_parses
+    [0, 1, 3, 5, 7, 13, 6447, 897_464, -1, -3, -7584, -900_098].each do |n|
+      assert_equal(n, Zold::Hexnum.parse(Zold::Hexnum.new(n, 6).to_s).to_i)
+    end
+  end
+end

data/test/test_patch.rb

@@ -40,12 +40,12 @@ class TestPatch < Minitest::Test
       third = Zold::Wallet.new(File.join(dir, 'third'))
       first.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
       File.write(second.path, File.read(first.path))
-      first.sub(Zold::Amount.new(zld: 39), "NOPREFIX@#{Zold::Id.new}", key)
-      first.sub(Zold::Amount.new(zld: 11), "NOPREFIX@#{Zold::Id.new}", key)
-      first.sub(Zold::Amount.new(zld: 3), "NOPREFIX@#{Zold::Id.new}", key)
-      second.sub(Zold::Amount.new(zld: 44), "NOPREFIX@#{Zold::Id.new}", key)
+      first.sub(Zold::Amount.new(zld: 39.0), "NOPREFIX@#{Zold::Id.new}", key)
+      first.sub(Zold::Amount.new(zld: 11.0), "NOPREFIX@#{Zold::Id.new}", key)
+      first.sub(Zold::Amount.new(zld: 3.0), "NOPREFIX@#{Zold::Id.new}", key)
+      second.sub(Zold::Amount.new(zld: 44.0), "NOPREFIX@#{Zold::Id.new}", key)
       File.write(third.path, File.read(first.path))
-      t = third.sub(Zold::Amount.new(zld: 10), "NOPREFIX@#{Zold::Id.new}", key)
+      t = third.sub(Zold::Amount.new(zld: 10.0), "NOPREFIX@#{Zold::Id.new}", key)
       third.add(t.inverse(id))
       patch = Zold::Patch.new
       patch.start(first)
@@ -53,7 +53,7 @@ class TestPatch < Minitest::Test
       patch.join(third)
       FileUtils.rm(first.path)
       assert_equal(true, patch.save(first.path))
-      assert_equal(Zold::Amount.new(zld: -53), first.balance)
+      assert_equal(Zold::Amount.new(zld: -53.0), first.balance)
     end
   end
 end

data/test/test_txn.rb

@@ -34,13 +34,13 @@ class TestTxn < Minitest::Test
     time = Time.now
     txn = Zold::Txn.parse(
       Zold::Txn.new(
-        123, time, Zold::Amount.new(zld: 99.95),
+        123, time, Zold::Amount.new(zld: -99.95),
         'NOPREFIX', Zold::Id.new,
         'Some details to see 123. Works, or not.'
       ).to_s
     )
     assert_equal(123, txn.id)
-    assert_equal('99.95', txn.amount.to_zld)
+    assert_equal('-99.95', txn.amount.to_zld)
     assert_equal('NOPREFIX', txn.prefix)
   end
 end