zold 0.2 → 0.3

data/test/commands/test_pay.rb

@@ -20,11 +20,11 @@
 
 require 'minitest/autorun'
 require 'tmpdir'
-require_relative '../../lib/zold/wallet.rb'
-require_relative '../../lib/zold/amount.rb'
-require_relative '../../lib/zold/key.rb'
-require_relative '../../lib/zold/id.rb'
-require_relative '../../lib/zold/commands/pay.rb'
+require_relative '../../lib/zold/wallets'
+require_relative '../../lib/zold/amount'
+require_relative '../../lib/zold/key'
+require_relative '../../lib/zold/id'
+require_relative '../../lib/zold/commands/pay'
 
 # PAY test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -33,17 +33,17 @@ require_relative '../../lib/zold/commands/pay.rb'
 class TestPay < Minitest::Test
   def test_sends_from_wallet_to_wallet
     Dir.mktmpdir 'test' do |dir|
-      source = Zold::Wallet.new(File.join(dir, 'source'))
-      source.init(Zold::Id.new, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+      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
       amount = Zold::Amount.new(zld: 14.95)
       Zold::Pay.new(
-        payer: source,
-        receiver: target,
-        amount: amount,
+        wallets: wallets,
         pvtkey: Zold::Key.new(file: 'fixtures/id_rsa')
-      ).run(['--force'])
-      assert source.balance == amount.mul(-1)
+      ).run(['--force', id.to_s, target.to_s, amount.to_zld, 'For the car'])
+      assert_equal(amount.mul(-1), source.balance)
     end
   end
 end

data/test/commands/test_remote.rb

@@ -21,11 +21,11 @@
 require 'minitest/autorun'
 require 'tmpdir'
 require 'webmock/minitest'
-require_relative '../../lib/zold/wallets.rb'
-require_relative '../../lib/zold/remotes.rb'
-require_relative '../../lib/zold/key.rb'
-require_relative '../../lib/zold/score.rb'
-require_relative '../../lib/zold/commands/remote.rb'
+require_relative '../../lib/zold/wallets'
+require_relative '../../lib/zold/remotes'
+require_relative '../../lib/zold/key'
+require_relative '../../lib/zold/score'
+require_relative '../../lib/zold/commands/remote'
 
 # REMOTE test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -35,9 +35,6 @@ class TestRemote < Minitest::Test
   def test_updates_remote
     Dir.mktmpdir 'test' do |dir|
       remotes = Zold::Remotes.new(File.join(dir, 'a/b/c/remotes'))
-      cmd = Zold::Remote.new(remotes: remotes)
-      cmd.run(['clean'])
-      cmd.run(%w[add localhost 1])
       stub_request(:get, 'http://localhost:1/remotes').to_return(
         status: 200,
         body: {
@@ -48,12 +45,15 @@ class TestRemote < Minitest::Test
           ]
         }.to_json
       )
-      cmd.run(%w[add localhost 2])
       stub_request(:get, 'http://localhost:2/remotes').to_return(
         status: 404
       )
-      assert_equal(remotes.all.count, 2)
-      cmd.run(['update'])
+      cmd = Zold::Remote.new(remotes: remotes)
+      cmd.run(['clean'])
+      cmd.run(%w[add localhost 1])
+      cmd.run(%w[add localhost 2])
+      assert_equal(2, remotes.all.count)
+      cmd.run(['update', '--ignore-score-weakness'])
       assert_equal(3, remotes.all.count)
     end
   end

data/test/commands/test_show.rb

@@ -20,10 +20,11 @@
 
 require 'minitest/autorun'
 require 'tmpdir'
-require_relative '../../lib/zold/wallet.rb'
-require_relative '../../lib/zold/key.rb'
-require_relative '../../lib/zold/id.rb'
-require_relative '../../lib/zold/commands/show.rb'
+require_relative '../../lib/zold/wallets'
+require_relative '../../lib/zold/wallet'
+require_relative '../../lib/zold/key'
+require_relative '../../lib/zold/id'
+require_relative '../../lib/zold/commands/show'
 
 # SHOW test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -33,10 +34,11 @@ class TestShow < Minitest::Test
   def test_checks_wallet_balance
     Dir.mktmpdir 'test' do |dir|
       id = Zold::Id.new
-      wallet = Zold::Wallets.new(dir).find(id)
+      wallets = Zold::Wallets.new(dir)
+      wallet = wallets.find(id)
       wallet.init(Zold::Id.new, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      balance = Zold::Show.new(wallet: wallet).run
-      assert balance == Zold::Amount::ZERO
+      balance = Zold::Show.new(wallets: wallets).run([id.to_s])
+      assert_equal(Zold::Amount::ZERO, balance)
     end
   end
 end

data/test/node/fake_node.rb

@@ -20,9 +20,9 @@
 
 require 'tmpdir'
 require 'webmock/minitest'
-require_relative '../../lib/zold/log.rb'
-require_relative '../../lib/zold/http.rb'
-require_relative '../../lib/zold/commands/node.rb'
+require_relative '../../lib/zold/log'
+require_relative '../../lib/zold/http'
+require_relative '../../lib/zold/commands/node'
 
 # Fake node.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/test/node/test_farm.rb

@@ -21,7 +21,7 @@
 require 'minitest/autorun'
 require 'rack/test'
 require 'tmpdir'
-require_relative '../../lib/zold/node/farm.rb'
+require_relative '../../lib/zold/node/farm'
 
 class FarmTest < Minitest::Test
   def test_makes_best_score_in_background

data/test/node/test_front.rb

@@ -20,12 +20,12 @@
 
 require 'minitest/autorun'
 require 'tmpdir'
-require_relative '../../lib/zold/key.rb'
-require_relative '../../lib/zold/id.rb'
-require_relative '../../lib/zold/amount.rb'
-require_relative '../../lib/zold/wallet.rb'
-require_relative '../../lib/zold/http.rb'
-require_relative 'fake_node.rb'
+require_relative '../../lib/zold/key'
+require_relative '../../lib/zold/id'
+require_relative '../../lib/zold/amount'
+require_relative '../../lib/zold/wallet'
+require_relative '../../lib/zold/http'
+require_relative 'fake_node'
 
 class FrontTest < Minitest::Test
   def test_renders_public_pages

data/test/test_amount.rb

@@ -20,7 +20,7 @@
 
 require 'minitest/autorun'
 require 'tmpdir'
-require_relative '../lib/zold/amount.rb'
+require_relative '../lib/zold/amount'
 
 # Amount test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/test/test_copies.rb

@@ -21,7 +21,7 @@
 require 'minitest/autorun'
 require 'tmpdir'
 require 'time'
-require_relative '../lib/zold/copies.rb'
+require_relative '../lib/zold/copies'
 
 # Copies test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/test/test_http.rb

@@ -22,7 +22,7 @@ require 'minitest/autorun'
 require 'tmpdir'
 require 'uri'
 require 'webmock/minitest'
-require_relative '../lib/zold/http.rb'
+require_relative '../lib/zold/http'
 
 # Http test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/test/test_id.rb

@@ -20,7 +20,7 @@
 
 require 'minitest/autorun'
 require 'tmpdir'
-require_relative '../lib/zold/id.rb'
+require_relative '../lib/zold/id'
 
 # ID test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/test/test_key.rb

@@ -20,7 +20,7 @@
 
 require 'minitest/autorun'
 require 'tmpdir'
-require_relative '../lib/zold/key.rb'
+require_relative '../lib/zold/key'
 
 # Key test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -62,4 +62,22 @@ class TestKey < Minitest::Test
       assert(pub.verify(signature, text))
     end
   end
+
+  def test_read_public_keys
+    Dir.new('fixtures/keys').select { |f| f =~ /\.pub$/ }.each do |f|
+      path = "fixtures/keys/#{f}"
+      pub = Zold::Key.new(file: path)
+      assert(pub.to_pub.length > 100)
+    end
+  end
+
+  def test_signs_with_real_keys
+    Dir.new('fixtures/keys').select { |f| f =~ /[0-9]+$/ }.each do |f|
+      pvt = Zold::Key.new(file: "fixtures/keys/#{f}")
+      pub = Zold::Key.new(file: "fixtures/keys/#{f}.pub")
+      text = 'How are you doing, my friend?'
+      signature = pvt.sign(text)
+      assert(pub.verify(signature, text))
+    end
+  end
 end

data/test/test_patch.rb

@@ -20,11 +20,11 @@
 
 require 'minitest/autorun'
 require 'tmpdir'
-require_relative '../lib/zold/key.rb'
-require_relative '../lib/zold/id.rb'
-require_relative '../lib/zold/wallet.rb'
-require_relative '../lib/zold/amount.rb'
-require_relative '../lib/zold/patch.rb'
+require_relative '../lib/zold/key'
+require_relative '../lib/zold/id'
+require_relative '../lib/zold/wallet'
+require_relative '../lib/zold/amount'
+require_relative '../lib/zold/patch'
 
 # Patch test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -40,13 +40,13 @@ 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), Zold::Id.new, key)
-      first.sub(Zold::Amount.new(zld: 11), Zold::Id.new, key)
-      first.sub(Zold::Amount.new(zld: 3), Zold::Id.new, key)
-      second.sub(Zold::Amount.new(zld: 44), Zold::Id.new, key)
+      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)
       File.write(third.path, File.read(first.path))
-      t = third.sub(Zold::Amount.new(zld: 10), Zold::Id.new, key)
-      third.add(t)
+      t = third.sub(Zold::Amount.new(zld: 10), "NOPREFIX@#{Zold::Id.new}", key)
+      third.add(t.inverse(id))
       patch = Zold::Patch.new
       patch.start(first)
       patch.join(second)

data/test/test_prefixes.rb

@@ -0,0 +1,46 @@
+# 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_relative '../lib/zold/key'
+require_relative '../lib/zold/id'
+require_relative '../lib/zold/wallet'
+require_relative '../lib/zold/prefixes'
+
+# Prefixes test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestPrefixes < Minitest::Test
+  def test_creates_and_validates
+    Dir.mktmpdir 'test' do |dir|
+      id = Zold::Id.new
+      wallet = Zold::Wallet.new(File.join(dir, id.to_s))
+      wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+      prefixes = Zold::Prefixes.new(wallet)
+      (8..32).each do |len|
+        prefix = prefixes.create(len)
+        assert_equal(len, prefix.length)
+        assert(prefixes.valid?(prefix))
+      end
+    end
+  end
+end

data/test/test_remotes.rb

@@ -20,7 +20,7 @@
 
 require 'minitest/autorun'
 require 'tmpdir'
-require_relative '../lib/zold/remotes.rb'
+require_relative '../lib/zold/remotes'
 
 # Remotes test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/test/test_score.rb

@@ -21,7 +21,7 @@
 require 'minitest/autorun'
 require 'tmpdir'
 require 'time'
-require_relative '../lib/zold/score.rb'
+require_relative '../lib/zold/score'
 
 # Score test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/test/test_signature.rb

@@ -20,10 +20,10 @@
 
 require 'minitest/autorun'
 require 'tmpdir'
-require_relative '../lib/zold/key.rb'
-require_relative '../lib/zold/id.rb'
-require_relative '../lib/zold/amount.rb'
-require_relative '../lib/zold/signature.rb'
+require_relative '../lib/zold/key'
+require_relative '../lib/zold/id'
+require_relative '../lib/zold/amount'
+require_relative '../lib/zold/signature'
 
 # Signature test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -33,13 +33,11 @@ class TestSignature < Minitest::Test
   def test_signs_and_validates
     pvt = Zold::Key.new(file: 'fixtures/id_rsa')
     pub = Zold::Key.new(file: 'fixtures/id_rsa.pub')
-    txn = {
-      id: 123,
-      details: 'How are you?',
-      bnf: Zold::Id.new.to_s,
-      amount: Zold::Amount.new(zld: 14.95)
-    }
-    txn[:sign] = Zold::Signature.new.sign(pvt, txn)
+    txn = Zold::Txn.new(
+      123, Time.now, Zold::Amount.new(zld: 14.95),
+      'NOPREFIX', Zold::Id.new, '-'
+    )
+    txn = txn.signed(pvt)
     assert(Zold::Signature.new.valid?(pub, txn))
   end
 end

data/test/test_wallet.rb

@@ -20,11 +20,12 @@
 
 require 'minitest/autorun'
 require 'tmpdir'
-require_relative '../lib/zold/key.rb'
-require_relative '../lib/zold/id.rb'
-require_relative '../lib/zold/wallet.rb'
-require_relative '../lib/zold/amount.rb'
-require_relative '../lib/zold/commands/pay.rb'
+require_relative '../lib/zold/key'
+require_relative '../lib/zold/id'
+require_relative '../lib/zold/wallet'
+require_relative '../lib/zold/txn'
+require_relative '../lib/zold/amount'
+require_relative '../lib/zold/commands/pay'
 
 # Wallet test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -36,9 +37,9 @@ class TestWallet < Minitest::Test
       wallet = wallet(dir)
       amount = Zold::Amount.new(zld: 39.99)
       key = Zold::Key.new(file: 'fixtures/id_rsa')
-      wallet.sub(amount, Zold::Id.new, key)
-      wallet.sub(amount, Zold::Id.new, key)
-      wallet.sub(amount, Zold::Id.new, key)
+      wallet.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
+      wallet.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
+      wallet.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
       assert(
         wallet.balance == amount.mul(-3),
         "#{wallet.balance} is not equal to #{amount.mul(-3)}"
@@ -51,15 +52,15 @@ class TestWallet < Minitest::Test
       wallet = wallet(dir)
       amount = Zold::Amount.new(zld: 39.99)
       key = Zold::Key.new(file: 'fixtures/id_rsa')
-      txn = wallet.sub(amount, Zold::Id.new, key)
-      wallet.add(txn)
-      assert(!Zold::Wallet.new(wallet.path).txns[0][:sign].end_with?("\n"))
+      txn = wallet.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
+      wallet.add(txn.inverse(wallet.id))
+      assert(!Zold::Wallet.new(wallet.path).txns[0].sign.end_with?("\n"))
     end
   end
 
   def test_initializes_it
     Dir.mktmpdir 'test' do |dir|
-      pkey = Zold::Key.new(file: 'fixtures/id_rsa.pub')
+      pkey = Zold::Key.new(file: File.join(Dir.pwd, 'fixtures/id_rsa.pub'))
       Dir.chdir(dir) do
         file = File.join(dir, 'source')
         wallet = Zold::Wallet.new(file)
@@ -77,20 +78,20 @@ class TestWallet < Minitest::Test
     Dir.mktmpdir 'test' do |dir|
       wallet = wallet(dir)
       wallet.add(
-        id: 1,
-        date: Time.now, amount: Zold::Amount.new(zld: 39.99),
-        bnf: Zold::Id.new,
-        details: '-'
+        Zold::Txn.new(
+          1, Time.now, Zold::Amount.new(zld: 39.99),
+          'NOPREFIX', Zold::Id.new, '-'
+        )
       )
       wallet.add(
-        id: 2,
-        date: Time.now, amount: Zold::Amount.new(zld: 14.95),
-        bnf: Zold::Id.new,
-        details: '-'
+        Zold::Txn.new(
+          2, Time.now, Zold::Amount.new(zld: 14.95),
+          'NOPREFIX', Zold::Id.new, '-'
+        )
       )
       sum = Zold::Amount::ZERO
       wallet.income do |t|
-        sum += t[:amount]
+        sum += t.amount
       end
       assert(
         sum == Zold::Amount.new(coins: 921_740_246),

data/test/test_wallets.rb

@@ -20,10 +20,10 @@
 
 require 'minitest/autorun'
 require 'tmpdir'
-require_relative '../lib/zold/key.rb'
-require_relative '../lib/zold/id.rb'
-require_relative '../lib/zold/wallets.rb'
-require_relative '../lib/zold/amount.rb'
+require_relative '../lib/zold/key'
+require_relative '../lib/zold/id'
+require_relative '../lib/zold/wallets'
+require_relative '../lib/zold/amount'
 
 # Wallets test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -254,6 +254,10 @@ files:
 - features/support/env.rb
 - fixtures/id_rsa
 - fixtures/id_rsa.pub
+- fixtures/keys/1.pub
+- fixtures/keys/2
+- fixtures/keys/2.pub
+- fixtures/scripts/print-helps.sh
 - fixtures/scripts/push-and-pull.sh
 - lib/zold.rb
 - lib/zold/amount.rb
@@ -261,6 +265,7 @@ files:
 - lib/zold/commands/create.rb
 - lib/zold/commands/diff.rb
 - lib/zold/commands/fetch.rb
+- lib/zold/commands/invoice.rb
 - lib/zold/commands/list.rb
 - lib/zold/commands/merge.rb
 - lib/zold/commands/node.rb
@@ -277,9 +282,11 @@ files:
 - lib/zold/node/farm.rb
 - lib/zold/node/front.rb
 - lib/zold/patch.rb
+- lib/zold/prefixes.rb
 - lib/zold/remotes.rb
 - lib/zold/score.rb
 - lib/zold/signature.rb
+- lib/zold/txn.rb
 - lib/zold/version.rb
 - lib/zold/wallet.rb
 - lib/zold/wallets.rb
@@ -288,6 +295,7 @@ files:
 - test/commands/test_create.rb
 - test/commands/test_diff.rb
 - test/commands/test_fetch.rb
+- test/commands/test_invoice.rb
 - test/commands/test_list.rb
 - test/commands/test_merge.rb
 - test/commands/test_node.rb
@@ -304,6 +312,7 @@ files:
 - test/test_id.rb
 - test/test_key.rb
 - test/test_patch.rb
+- test/test_prefixes.rb
 - test/test_remotes.rb
 - test/test_score.rb
 - test/test_signature.rb
@@ -345,6 +354,7 @@ test_files:
 - test/commands/test_create.rb
 - test/commands/test_diff.rb
 - test/commands/test_fetch.rb
+- test/commands/test_invoice.rb
 - test/commands/test_list.rb
 - test/commands/test_merge.rb
 - test/commands/test_node.rb
@@ -361,6 +371,7 @@ test_files:
 - test/test_id.rb
 - test/test_key.rb
 - test/test_patch.rb
+- test/test_prefixes.rb
 - test/test_remotes.rb
 - test/test_score.rb
 - test/test_signature.rb