zold 0.5 → 0.6

data/test/node/fake_node.rb

@@ -45,6 +45,7 @@ class FakeNode
           home = File.join(dir, 'node-home')
           Zold::Node.new(log: @log).run(
             [
+              '--invoice', 'NOPREFIX@ffffffffffffffff',
               '--port', port.to_s,
               '--host=locahost',
               '--bind-port', port.to_s,

data/test/node/test_farm.rb

@@ -21,11 +21,12 @@
 require 'minitest/autorun'
 require 'rack/test'
 require 'tmpdir'
+require_relative '../../lib/zold/log'
 require_relative '../../lib/zold/node/farm'
 
 class FarmTest < Minitest::Test
   def test_makes_best_score_in_background
-    farm = Zold::Farm.new
+    farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff')
     farm.start('localhost', 80, threads: 4, strength: 2)
     sleep 1 while farm.best.empty? || farm.best[0].value.zero?
     assert(farm.best[0].value > 0)

data/test/node/test_front.rb

@@ -22,6 +22,7 @@ require 'minitest/autorun'
 require 'tmpdir'
 require_relative '../../lib/zold/key'
 require_relative '../../lib/zold/id'
+require_relative '../../lib/zold/log'
 require_relative '../../lib/zold/amount'
 require_relative '../../lib/zold/wallet'
 require_relative '../../lib/zold/http'

data/test/test__helper.rb

@@ -20,6 +20,8 @@
 
 STDOUT.sync = true
 
+ENV['RACK_ENV'] = 'test'
+
 require 'simplecov'
 SimpleCov.start
 if ENV['CI'] == 'true'

data/test/test_remotes.rb

@@ -33,7 +33,6 @@ class TestRemotes < Minitest::Test
       FileUtils.touch(file)
       remotes = Zold::Remotes.new(file)
       remotes.add('127.0.0.1')
-      remotes.add('127.0.0.1')
       assert(1, remotes.all.count)
     end
   end

data/test/test_score.rb

@@ -28,20 +28,11 @@ require_relative '../lib/zold/score'
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 class TestScore < Minitest::Test
-  def test_validates_score
-    score = Zold::Score.new(
-      Time.parse('2017-07-19T21:24:51Z'),
-      'localhost', 443,
-      %w[9a81d5 40296e], strength: 6
-    )
-    assert(score.valid?)
-    assert_equal(score.value, 2)
-  end
-
   def test_reduces_itself
     score = Zold::Score.new(
       Time.parse('2017-07-19T21:24:51Z'),
-      'localhost', 443, %w[A B C D E F G]
+      'localhost', 443, 'NOPREFIX@ffffffffffffffff',
+      %w[A B C D E F G]
     ).reduced(2)
     assert_equal(score.value, 2)
   end
@@ -49,9 +40,10 @@ class TestScore < Minitest::Test
   def test_validates_wrong_score
     score = Zold::Score.new(
       Time.parse('2017-07-19T21:24:51Z'),
-      'localhost', 443, %w[xxx yyy zzz]
+      'localhost', 443, 'NOPREFIX@ffffffffffffffff',
+      %w[xxx yyy zzz]
     )
-    assert_equal(score.value, 3)
+    assert_equal(3, score.value)
     assert(!score.valid?)
   end
 
@@ -59,21 +51,48 @@ class TestScore < Minitest::Test
     time = Time.now
     score = Zold::Score.parse(
       Zold::Score.new(
-        time, 'localhost', 999, %w[FIRST SECOND THIRD]
+        time, 'localhost', 999, 'NOPREFIX@ffffffffffffffff',
+        %w[FIRST SECOND THIRD]
       ).to_s
     )
-    assert_equal(score.value, 3)
+    assert_equal(3, score.value)
+    assert_equal(score.time.to_s, time.to_s)
+    assert_equal('localhost', score.host)
+    assert_equal(999, score.port)
+  end
+
+  def test_prints_and_parses_text
+    time = Time.now
+    score = Zold::Score.parse_text(
+      Zold::Score.new(
+        time, 'a.example.com', 999, 'NOPREFIX@ffffffffffffffff',
+        %w[FIRST SECOND THIRD]
+      ).to_text
+    )
+    assert_equal(3, score.value)
     assert_equal(score.time.to_s, time.to_s)
-    assert_equal(score.host, 'localhost')
-    assert_equal(score.port, 999)
+    assert_equal('a.example.com', score.host)
+    assert_equal(999, score.port)
+  end
+
+  def test_prints_and_parses_text_zero_score
+    time = Time.now
+    score = Zold::Score.parse_text(
+      Zold::Score.new(
+        time, '192.168.0.1', 1, 'NOPREFIX@ffffffffffffffff', []
+      ).to_text
+    )
+    assert_equal(0, score.value)
+    assert(!score.expired?)
   end
 
   def test_finds_next_score
     score = Zold::Score.new(
-      Time.parse('2017-07-19T21:24:51Z'), 'localhost', 443, strength: 4
-    ).next
-    assert_equal(score.value, 1)
-    assert_equal(score.to_s, '1: 2017-07-19T21:24:51Z localhost 443 1169e')
+      Time.now, 'localhost', 443,
+      'NOPREFIX@ffffffffffffffff', strength: 2
+    ).next.next.next
+    assert_equal(3, score.value)
     assert(score.valid?)
+    assert(!score.expired?)
   end
 end

data/test/test_signature.rb

@@ -22,6 +22,7 @@ require 'minitest/autorun'
 require 'tmpdir'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/id'
+require_relative '../lib/zold/txn'
 require_relative '../lib/zold/amount'
 require_relative '../lib/zold/signature'
 
@@ -35,9 +36,11 @@ class TestSignature < Minitest::Test
     pub = Zold::Key.new(file: 'fixtures/id_rsa.pub')
     txn = Zold::Txn.new(
       123, Time.now, Zold::Amount.new(zld: 14.95),
-      'NOPREFIX', Zold::Id.new, '-'
+      'NOPREFIX', Zold::Id.new, 'hello, world!'
     )
-    txn = txn.signed(pvt)
-    assert(Zold::Signature.new.valid?(pub, txn))
+    id = Zold::Id.new
+    txn = txn.signed(pvt, id)
+    assert_equal(684, txn.sign.length)
+    assert(Zold::Signature.new.valid?(pub, id, txn))
   end
 end

data/test/test_tax.rb

@@ -0,0 +1,53 @@
+# 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 'time'
+require_relative '../lib/zold/id'
+require_relative '../lib/zold/txn'
+require_relative '../lib/zold/wallet'
+require_relative '../lib/zold/tax'
+require_relative '../lib/zold/key'
+require_relative '../lib/zold/amount'
+
+# Tax test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestTax < Minitest::Test
+  def test_calculates_tax_for_one_year
+    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'))
+      wallet.add(
+        Zold::Txn.new(
+          1,
+          Time.now - 24 * 60 * 365,
+          Zold::Amount.new(zld: 19.99),
+          'NOPREFIX', Zold::Id.new, '-'
+        )
+      )
+      tax = Zold::Tax.new(wallet)
+      assert_equal(Zold::Amount.new(coins: 61_320), tax.debt)
+    end
+  end
+end

data/test/test_txn.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 'time'
+require_relative '../lib/zold/id'
+require_relative '../lib/zold/txn'
+require_relative '../lib/zold/amount'
+
+# Txn test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestTxn < Minitest::Test
+  def test_prints_and_parses
+    time = Time.now
+    txn = Zold::Txn.parse(
+      Zold::Txn.new(
+        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('NOPREFIX', txn.prefix)
+  end
+end

data/test/test_wallet.rb

@@ -41,8 +41,8 @@ class TestWallet < Minitest::Test
       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)}"
+        wallet.balance == amount * -3,
+        "#{wallet.balance} is not equal to #{amount * -3}"
       )
     end
   end

data/test/test_zold.rb

@@ -61,7 +61,7 @@ class TestZold < Minitest::Test
       FileUtils.cp('fixtures/id_rsa.pub', dir)
       FileUtils.cp('fixtures/id_rsa', dir)
       stdout = exec(
-        '--private-key id_rsa --public-key id_rsa.pub --verbose --trace create',
+        '--verbose --trace create --public-key=id_rsa.pub',
         dir
       )
       assert(stdout.include?('created at'))

data/wp/.gitignore

@@ -0,0 +1,6 @@
+wp.aux
+wp.bcf
+wp.log
+wp.out
+wp.pdf
+wp.run.xml

data/wp/wp.tex

@@ -0,0 +1,38 @@
+\documentclass[11pt,oneside]{article}
+\usepackage[utf8]{inputenc}
+\usepackage[american]{babel}
+\usepackage[
+  paperwidth=6in, paperheight=9in,
+  bindingoffset=0.25in, left=0.75in, right=0.75in, top=0.75in, bottom=1.25in
+]{geometry}
+\usepackage{setspace}
+\usepackage{indentfirst}
+
+\pagestyle{empty}
+\setlength{\topskip}{6pt}
+\setlength{\parindent}{0pt} % indent first line
+\setlength{\parskip}{0pt} % before par
+\interfootnotelinepenalty=10000
+\setstretch{1.1}
+
+\usepackage{mathpazo} % Palantino font
+
+\usepackage{hyperref}
+\usepackage[style=authoryear,sorting=nyt,backend=biber,
+  hyperref=true,abbreviate=true,
+  maxcitenames=1,maxbibnames=1]{biblatex}
+  \addbibresource{main.bib}
+
+\title{Zold, Lightweight Crypto Currency}
+\author{Yegor Bugayenko\\
+CEO of Zerocracy, Inc.\\
+555 Bryant, Ste 470, Palo Alto, CA 94301\\
+\texttt{yegor@zerocracy.com}\\
+408.692.4742}
+\begin{document}
+
+\raggedbottom
+
+how are you?
+
+\end{document}

data/zold.gemspec

@@ -26,9 +26,7 @@ require_relative 'lib/zold/version'
 
 Gem::Specification.new do |s|
   s.specification_version = 2 if s.respond_to? :specification_version=
-  if s.respond_to? :required_rubygems_version=
-    s.required_rubygems_version = Gem::Requirement.new('>= 0')
-  end
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.rubygems_version = '2.2'
   s.required_ruby_version = '>= 2.2'
   s.name = 'zold'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-13 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -288,6 +288,7 @@ files:
 - lib/zold/commands/push.rb
 - lib/zold/commands/remote.rb
 - lib/zold/commands/show.rb
+- lib/zold/commands/taxes.rb
 - lib/zold/copies.rb
 - lib/zold/http.rb
 - lib/zold/id.rb
@@ -301,6 +302,7 @@ files:
 - lib/zold/remotes.rb
 - lib/zold/score.rb
 - lib/zold/signature.rb
+- lib/zold/tax.rb
 - lib/zold/txn.rb
 - lib/zold/version.rb
 - lib/zold/wallet.rb
@@ -317,6 +319,7 @@ files:
 - test/commands/test_pay.rb
 - test/commands/test_remote.rb
 - test/commands/test_show.rb
+- test/commands/test_taxes.rb
 - test/node/fake_node.rb
 - test/node/test_farm.rb
 - test/node/test_front.rb
@@ -331,9 +334,13 @@ files:
 - test/test_remotes.rb
 - test/test_score.rb
 - test/test_signature.rb
+- test/test_tax.rb
+- test/test_txn.rb
 - test/test_wallet.rb
 - test/test_wallets.rb
 - test/test_zold.rb
+- wp/.gitignore
+- wp/wp.tex
 - zold.gemspec
 homepage: http://github.com/zerocracy/zold
 licenses:
@@ -376,6 +383,7 @@ test_files:
 - test/commands/test_pay.rb
 - test/commands/test_remote.rb
 - test/commands/test_show.rb
+- test/commands/test_taxes.rb
 - test/node/fake_node.rb
 - test/node/test_farm.rb
 - test/node/test_front.rb
@@ -390,6 +398,8 @@ test_files:
 - test/test_remotes.rb
 - test/test_score.rb
 - test/test_signature.rb
+- test/test_tax.rb
+- test/test_txn.rb
 - test/test_wallet.rb
 - test/test_wallets.rb
 - test/test_zold.rb