zold 0.13.46 → 0.14.0

data/lib/zold/wallets.rb

@@ -17,7 +17,7 @@
 # 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 'pathname'
 require_relative 'id'
 require_relative 'wallet'
 
@@ -35,8 +35,10 @@ module Zold
     # @todo #70:30min Let's make it smarter. Instead of returning
     #  the full path let's substract the prefix from it if it's equal
     #  to the current directory in Dir.pwd.
-    def to_s
-      path
+    def to_s(curr_dir = Dir.pwd)
+      curr_path = Pathname.new(path)
+      dir_path = Pathname.new(curr_dir)
+      curr_path.relative_path_from(dir_path).to_s
     end
 
     def path
@@ -48,11 +50,12 @@ module Zold
     def all
       Dir.new(path).select do |f|
         file = File.join(@dir, f)
+        basename = File.basename(f, Wallet::EXTENSION)
         File.file?(file) &&
           !File.directory?(file) &&
-          f =~ /^[0-9a-fA-F]{16}$/ &&
-          Id.new(f).to_s == f
-      end
+          basename =~ /^[0-9a-fA-F]{16}$/ &&
+          Id.new(basename).to_s == basename
+      end.map { |w| File.basename(w, Wallet::EXTENSION) }
     end
 
     def find(id)

data/test/commands/routines/test_spread.rb

@@ -24,6 +24,7 @@ require_relative '../../test__helper'
 require_relative '../../fake_home'
 require_relative '../../node/fake_node'
 require_relative '../../../lib/zold/commands/routines/spread.rb'
+require_relative '../../../lib/zold/node/entrance.rb'
 
 # Spread test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)

data/test/commands/test_alias.rb

@@ -0,0 +1,7 @@
+require 'minitest/autorun'
+
+# @todo #279:30min Write unit tests for the alias command.
+#  It should test all the subcommands (set, remove and show)
+#  and any options.
+class TestAlias < Minitest::Test
+end

data/test/commands/test_create.rb

@@ -37,8 +37,8 @@ class TestCreate < Minitest::Test
       )
       assert wallet.balance.zero?
       assert(
-        File.exist?(File.join(dir, wallet.id.to_s)),
-        "Wallet file not found: #{wallet.id}"
+        File.exist?(File.join(dir, "#{wallet.id}#{Zold::Wallet::EXTENSION}")),
+        "Wallet file not found: #{wallet.id}#{Zold::Wallet::EXTENSION}"
       )
     end
   end

data/test/commands/test_fetch.rb

@@ -46,7 +46,8 @@ class TestFetch < Minitest::Test
         status: 200,
         body: {
           'score': Zold::Score::ZERO.to_h,
-          'body': File.read(wallet.path)
+          'body': File.read(wallet.path),
+          'mtime': Time.now.utc.iso8601
         }.to_json
       )
       stub_request(:get, "http://localhost:81/wallet/#{wallet.id}").to_return(

data/test/commands/test_merge.rb

@@ -140,6 +140,8 @@ class TestMerge < Minitest::Test
     Dir.new(base).select { |f| File.directory?(File.join(base, f)) && !f.start_with?('.') }.each do |f|
       Dir.mktmpdir 'test' do |dir|
         FileUtils.cp_r(File.join('fixtures/merge', "#{f}/."), dir)
+        scores = File.join(dir, 'copies/0123456789abcdef/scores.z')
+        File.write(scores, File.read(scores).gsub(/NOW/, Time.now.utc.iso8601))
         FileUtils.cp('fixtures/merge/asserts.rb', dir)
         wallets = Zold::Wallets.new(dir)
         copies = File.join(dir, 'copies')

data/test/commands/test_node.rb

@@ -48,6 +48,7 @@ class TestNode < Minitest::Test
           ['push', '--ignore-score-weakness']
         )
         copies = home.copies(wallet)
+        sleep 2
         Zold::Fetch.new(
           wallets: wallets, copies: copies.root,
           remotes: remotes, log: test_log

data/test/commands/test_pay.rb

@@ -82,4 +82,28 @@ class TestPay < Minitest::Test
       assert_equal(Zold::Amount::ZERO, source.balance)
     end
   end
+
+  def test_notifies_about_tax_status
+    FakeHome.new.run do |home|
+      source = home.create_wallet
+      target = home.create_wallet
+      amount = Zold::Amount.new(zld: 14.95)
+      accumulating_log = test_log.dup
+      class << accumulating_log
+        attr_accessor :info_messages
+
+        def info(message)
+          (@info_messages ||= []) << message
+        end
+      end
+      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: accumulating_log).run(
+        [
+          'pay', '--force', '--private-key=fixtures/id_rsa',
+          source.id.to_s, target.id.to_s, amount.to_zld, 'For the car'
+        ]
+      )
+      assert_equal accumulating_log.info_messages.grep(/^The tax debt/).size, 1,
+        'No info_messages notified user of tax debt'
+    end
+  end
 end

data/test/commands/test_remote.rb

@@ -88,4 +88,32 @@ class TestRemote < Minitest::Test
       assert_equal(1, winners.count)
     end
   end
+
+  def test_remote_trim_with_tolerate
+    Dir.mktmpdir 'test' do |dir|
+      remotes = Zold::Remotes.new(File.join(dir, 'remotes.txt'))
+      zero = Zold::Score::ZERO
+      stub_request(:get, "http://#{zero.host}:#{zero.port}/remotes").to_return(
+        status: 200,
+        body: {
+          version: Zold::VERSION,
+          score: zero.to_h,
+          all: [
+            { host: 'localhost', port: 888 }
+          ]
+        }.to_json
+      )
+      stub_request(:get, 'http://localhost:888/remotes').to_return(
+        status: 404
+      )
+      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(%w[remote add localhost 888 --skip-ping])
+      cmd.run(['remote', 'update', '--ignore-score-weakness'])
+      cmd.run(['remote', 'trim', '--tolerate=0'])
+      assert_equal(1, remotes.all.count)
+    end
+  end
 end

data/test/node/test_async_entrance.rb

@@ -31,8 +31,8 @@ require_relative 'fake_entrance'
 # License:: MIT
 class TestAsyncEntrance < Minitest::Test
   def test_renders_json
-    FakeHome.new.run do
-      Zold::AsyncEntrance.new(FakeEntrance.new, log: test_log).start do |e|
+    FakeHome.new.run do |home|
+      Zold::AsyncEntrance.new(FakeEntrance.new, home.dir, log: test_log).start do |e|
         assert_equal(true, e.to_json[:'pool.running'])
       end
     end
@@ -45,13 +45,10 @@ class TestAsyncEntrance < Minitest::Test
       key = Zold::Key.new(file: 'fixtures/id_rsa')
       wallet.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
       basic = CountingEntrance.new
-      Zold::AsyncEntrance.new(basic, log: test_log).start do |e|
+      Zold::AsyncEntrance.new(basic, File.join(home.dir, 'a/b/c'), log: test_log).start do |e|
         5.times { e.push(wallet.id, File.read(wallet.path)) }
-        sleep 0.1 until e.to_json[:'pool.completed_task_count'] == 5
-        assert_equal(5, basic.count)
-        assert_equal(0, e.to_json[:'pool.queue_length'])
-        assert_equal(5, e.to_json[:'pool.length'])
-        assert_equal(5, e.to_json[:'pool.largest_length'])
+        sleep 0.1 while basic.count.zero?
+        assert(!basic.count.zero?)
       end
     end
   end
@@ -59,12 +56,8 @@ class TestAsyncEntrance < Minitest::Test
   def test_handles_broken_entrance_gracefully
     FakeHome.new.run do |home|
       wallet = home.create_wallet
-      Zold::AsyncEntrance.new(BrokenEntrance.new, log: test_log).start do |e|
+      Zold::AsyncEntrance.new(BrokenEntrance.new, home.dir, log: test_log).start do |e|
         e.push(wallet.id, File.read(wallet.path))
-        sleep 0.1 while e.to_json[:'pool.length'].zero?
-        assert_equal(0, e.to_json[:'pool.queue_length'])
-        assert_equal(1, e.to_json[:'pool.length'])
-        assert_equal(1, e.to_json[:'pool.largest_length'])
       end
     end
   end

data/test/node/test_front.rb

@@ -84,7 +84,8 @@ class FrontTest < Minitest::Test
           "/wallet/#{wallet.id}",
           "/wallet/#{wallet.id}.txt",
           "/wallet/#{wallet.id}/balance",
-          "/wallet/#{wallet.id}/key"
+          "/wallet/#{wallet.id}/key",
+          "/wallet/#{wallet.id}/mtime"
         ].each do |u|
           res = Zold::Http.new(u).get
           assert_equal('200', res.code, res.body)

data/test/test__helper.rb

@@ -37,8 +37,9 @@ module Minitest
   class Test
     def test_log
       require_relative '../lib/zold/log'
-      # @test_log = Zold::Log::Quiet.new
-      @test_log ||= Zold::Log::Verbose.new
+      @test_log = Zold::Log::Verbose.new
+      @test_log = Zold::Log::Quiet.new if ENV['TEST_QUIET_LOG']
+      @test_log
     end
   end
 end

data/test/test_atomic_file.rb

@@ -42,12 +42,7 @@ class TestAtomicFile < Minitest::Test
     end
   end
 
-  # @todo #262:30min This test is skipped because it doesn't work. I can't
-  #  understand why. It seems that File.open() creates an empty file first
-  #  which is then being read by File.read() in another thread. Let's find
-  #  out and make AtomicFile truly thread-safe.
   def test_writes_from_many_threads
-    skip
     Dir.mktmpdir 'test' do |dir|
       file = Zold::AtomicFile.new(File.join(dir, 'a.txt'))
       threads = 10

data/test/test_copies.rb

@@ -22,6 +22,7 @@ require 'minitest/autorun'
 require 'tmpdir'
 require 'time'
 require_relative '../lib/zold/copies'
+require_relative '../lib/zold/wallet'
 
 # Copies test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -66,10 +67,10 @@ class TestCopies < Minitest::Test
       copies = Zold::Copies.new(dir)
       copies.add('h1', 'zold.io', 50, 80, Time.now - 25 * 60 * 60)
       copies.add('h1', 'zold.io', 33, 80, Time.now - 26 * 60 * 60)
-      assert(File.exist?(File.join(dir, '1')))
+      assert(File.exist?(File.join(dir, "1#{Zold::Wallet::EXTENSION}")))
       copies.clean
       assert(copies.all.empty?, "#{copies.all.count} is not empty")
-      assert(!File.exist?(File.join(dir, '1')))
+      assert(!File.exist?(File.join(dir, "1#{Zold::Wallet::EXTENSION}")))
     end
   end
 
@@ -82,6 +83,17 @@ class TestCopies < Minitest::Test
     end
   end
 
+  def test_sorts_them_by_score
+    Dir.mktmpdir 'test' do |dir|
+      copies = Zold::Copies.new(dir)
+      copies.add('content-1', '1.zold.io', 80, 1)
+      copies.add('content-2', '2.zold.io', 80, 2)
+      copies.add('content-3', '3.zold.io', 80, 50)
+      copies.add('content-4', '4.zold.io', 80, 3)
+      assert_equal('50 3 2 1', copies.all.map { |c| c[:score] }.join(' '))
+    end
+  end
+
   def test_ignores_too_old_scores
     Dir.mktmpdir 'test' do |dir|
       copies = Zold::Copies.new(dir)

data/test/test_remotes.rb

@@ -91,6 +91,18 @@ class TestRemotes < Minitest::Test
     end
   end
 
+  def test_log_msg_of_iterates_when_take_too_long
+    Dir.mktmpdir 'test' do |dir|
+      file = File.join(dir, 'remotes')
+      FileUtils.touch(file)
+      remotes = Zold::Remotes.new(file)
+      remotes.add('127.0.0.1')
+      log = TestLogger.new
+      remotes.iterate(log) { sleep(17) }
+      assert(log.msg.include?('Took too long to execute'))
+    end
+  end
+
   def test_removes_remotes
     Dir.mktmpdir 'test' do |dir|
       file = File.join(dir, 'remotes')

data/test/test_score.rb

@@ -21,6 +21,7 @@
 require 'minitest/autorun'
 require 'tmpdir'
 require 'time'
+require_relative 'test__helper'
 require_relative '../lib/zold/score'
 
 # Score test.
@@ -142,4 +143,17 @@ class TestScore < Minitest::Test
     ).next
     assert(score.hash.end_with?('000'))
   end
+
+  def test_generates_hash_correctly
+    score = Zold::Score.new(
+      Time.parse('2018-06-27T06:22:41Z'), 'b2.zold.io', 4096,
+      'THdonv1E@abcdabcdabcdabcd', ['3a934b']
+    )
+    assert_equal('c9c72efbf6beeea13408c5e720ec42aec017c11c3db335e05595c03755000000', score.hash)
+    score = Zold::Score.new(
+      Time.parse('2018-06-27T06:22:41Z'), 'b2.zold.io', 4096,
+      'THdonv1E@abcdabcdabcdabcd', %w[3a934b 1421217]
+    )
+    assert_equal('e04ab4e69f86aa17be1316a52148e7bc3187c6d3df581d885a862d8850000000', score.hash)
+  end
 end

data/test/test_tax.rb

@@ -20,6 +20,7 @@
 
 require 'minitest/autorun'
 require 'time'
+require_relative 'test__helper'
 require_relative 'fake_home'
 require_relative '../lib/zold/id'
 require_relative '../lib/zold/txn'
@@ -35,6 +36,10 @@ require_relative '../lib/zold/score'
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 class TestTax < Minitest::Test
+  def test_print_fee
+    test_log.info("Fee in zents: #{Zold::Tax::FEE_TXN_HOUR.to_i}")
+  end
+
   def test_calculates_tax_for_one_year
     FakeHome.new.run do |home|
       wallet = home.create_wallet

data/test/test_upgrades.rb

@@ -0,0 +1,97 @@
+# 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 'test__helper'
+require_relative '../lib/zold/upgrades'
+require_relative '../lib/zold/version_file'
+
+# Upgrade test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestUpgrades < Minitest::Test
+  # @todo #327:30min Uncomment, when you're ready to work on upgrade manager's
+  #  test case of absent version file. Start with running the test first.
+  def test_no_version_file_is_ok
+    skip
+    Dir.mktmpdir do |dir|
+      script_version = '0.0.1'
+      create_upgrade_file(dir, script_version)
+      assert_output(/#{expected_upgrade_script_output(script_version)}/) do
+        run_upgrades(dir)
+      end
+    end
+  end
+
+  # @todo #327:30min Uncomment, when you're ready to work on upgrade manager's
+  #  test case of running only pending upgrade scripts (i.e. the scripts with
+  #  versions greater than those in the version file).
+  def test_pending_scripts_run
+    skip
+    Dir.mktmpdir do |dir|
+      %w[0.0.1 0.0.2].each do |script_version|
+        create_upgrade_file(dir, script_version)
+      end
+      create_version_file(dir, '0.0.1')
+      assert_output(/#{expected_upgrade_script_output('0.0.2')}/) do
+        run_upgrades(dir)
+      end
+    end
+  end
+
+  def test_already_ran_scripts_dont_run
+    Dir.mktmpdir do |dir|
+      %w[0.0.1 0.0.2].each do |script_version|
+        create_upgrade_file(dir, script_version)
+      end
+      create_version_file(dir, '0.0.1')
+      out, _err = capture_io do
+        run_upgrades(dir)
+      end
+      refute_match(/#{expected_upgrade_script_output('0.0.1')}/, out)
+    end
+  end
+
+  private
+
+  def run_upgrades(dir)
+    Zold::Upgrades.new(version_file(dir), dir).run
+  end
+
+  def version_file(dir)
+    Zold::VersionFile.new(File.join(dir, 'version'))
+  end
+
+  def create_version_file(dir, version)
+    IO.write(File.join(dir, 'version'), version)
+  end
+
+  def create_upgrade_file(dir, version)
+    IO.write(
+      File.join(dir, "#{version}.rb"),
+      "puts \"#{expected_upgrade_script_output(version)}\""
+    )
+  end
+
+  def expected_upgrade_script_output(version)
+    "upgrading to #{version}"
+  end
+end

data/test/test_version.rb

@@ -0,0 +1,13 @@
+require 'semantic'
+require 'zold/version'
+require 'minitest/autorun'
+
+class TestVersion < Minitest::Test
+  def test_has_version
+    assert Semantic::Version.new(Zold::VERSION)
+  end
+
+  def test_has_protocol
+    assert Zold::PROTOCOL
+  end
+end

data/test/test_wallet.rb

@@ -44,7 +44,6 @@ class TestWallet < Minitest::Test
         wallet.balance == amount * -3,
         "#{wallet.balance} is not equal to #{amount * -3}"
       )
-      assert_equal('1', wallet.version)
     end
   end
 
@@ -83,6 +82,27 @@ class TestWallet < Minitest::Test
     end
   end
 
+  def test_returns_modified_time
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      assert(wallet.mtime > Time.now - 60 * 60)
+    end
+  end
+
+  def test_returns_digest
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      assert_equal(64, wallet.digest.length)
+    end
+  end
+
+  def test_returns_protocol
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      assert_equal(Zold::PROTOCOL, wallet.protocol)
+    end
+  end
+
   def test_iterates_income_transactions
     FakeHome.new.run do |home|
       wallet = home.create_wallet

data/test/test_wallets.rb

@@ -50,4 +50,12 @@ class TestWallets < Minitest::Test
       assert_equal(1, wallets.all.count)
     end
   end
+
+  def test_substracts_dir_path_from_full_path
+    FakeHome.new.run do |home|
+      wallets = home.wallets
+      path = wallets.path
+      assert_equal('.', wallets.to_s(path))
+    end
+  end
 end

data/upgrades/2.rb

@@ -0,0 +1,20 @@
+# https://github.com/zold-io/zold/issues/358
+# rename all wallets from their current names into *.z
+
+module Zold
+  # Upgrade to version 2
+  class UpgradeTo2
+    def initialize(home, log)
+      @home = home
+      @log = log
+    end
+
+    def exec
+      Dir.new(@home).each do |path|
+        next unless path =~ /^[a-f0-9]{16}$/
+        File.rename(path, "#{path}.z")
+        @log.info("Renamed #{path} to #{path}.z")
+      end
+    end
+  end
+end

data/zold.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
 their ability to become an alternative financial instrument in many
 different markets. Most of the technologies available at the moment are
 based on the principles of Blockchain architecture, including
-dominating currencies like Bitcoin and Etherium. Despite its
+dominating currencies like Bitcoin and Ethereum. Despite its
 popularity, Blockchain is not the best possible solution for all scenarios.
 One such example is for fast micro-payments.
 Zold is an experimental alternative that enables distributed transactions between
@@ -59,8 +59,8 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'openssl', '~>2.1'
   s.add_runtime_dependency 'rainbow', '~>3.0'
   s.add_runtime_dependency 'rake', '~>12.3' # has to stay here for Heroku
-  s.add_runtime_dependency 'rubocop', '~>0.52' # has to stay here for Heroku
-  s.add_runtime_dependency 'rubocop-rspec', '~>1.23' # has to stay here for Heroku
+  s.add_runtime_dependency 'rubocop', '0.58.1' # has to stay here for Heroku
+  s.add_runtime_dependency 'rubocop-rspec', '1.27.0' # has to stay here for Heroku
   s.add_runtime_dependency 'semantic', '~>1.6'
   s.add_runtime_dependency 'sigdump', '~>0.2'
   s.add_runtime_dependency 'sinatra', '~>2.0'