zold 0.13.34 → 0.13.35

data/lib/zold/version.rb

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

data/lib/zold/wallet.rb

@@ -94,7 +94,7 @@ module Zold
       txns.inject(Amount::ZERO) { |sum, t| sum + t.amount }
     end
 
-    def sub(amount, invoice, pvt, details = '-')
+    def sub(amount, invoice, pvt, details = '-', time: Time.now)
       raise 'The amount has to be of type Amount' unless amount.is_a?(Amount)
       raise "The amount can't be negative: #{amount}" if amount.negative?
       raise 'The pvt has to be of type Key' unless pvt.is_a?(Key)
@@ -103,7 +103,7 @@ module Zold
       raise 'Too many transactions already, can\'t add more' if max > 0xffff
       txn = Txn.new(
         tid,
-        Time.now,
+        time,
         amount * -1,
         prefix,
         Id.new(target),
@@ -149,7 +149,7 @@ module Zold
       lines.drop(5)
         .each_with_index
         .map { |line, i| Txn.parse(line, i + 6) }
-        .sort_by(&:date)
+        .sort_by { |t| [t.date, t.amount * -1] }
     end
 
     private

data/lib/zold/wallets.rb

@@ -56,6 +56,8 @@ module Zold
     end
 
     def find(id)
+      raise 'Id can\'t be nil' if id.nil?
+      raise 'Id must be of type Id' unless id.is_a?(Id)
       Zold::Wallet.new(File.join(path, id.to_s))
     end
   end

data/test/commands/routines/test_bonuses.rb

@@ -34,8 +34,8 @@ require_relative '../../../lib/zold/commands/routines/bonuses.rb'
 # License:: MIT
 class TestBonuses < Minitest::Test
   def test_pays_bonuses
-    FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
-      FakeHome.new.run do |home|
+    FakeHome.new.run do |home|
+      FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
         bank = home.create_wallet
         Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
           ['pay', home.create_wallet.id.to_s, bank.id.to_s, '100', '--force', '--private-key=id_rsa']

data/test/commands/test_fetch.rb

@@ -24,6 +24,7 @@ require 'json'
 require 'time'
 require 'webmock/minitest'
 require_relative '../test__helper'
+require_relative '../fake_home'
 require_relative '../../lib/zold/wallet'
 require_relative '../../lib/zold/wallets'
 require_relative '../../lib/zold/remotes'
@@ -39,54 +40,27 @@ require_relative '../../lib/zold/commands/fetch'
 # License:: MIT
 class TestFetch < Minitest::Test
   def test_fetches_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(:get, "http://localhost:80/wallet/#{id}").to_return(
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      stub_request(:get, "http://localhost:80/wallet/#{wallet.id}").to_return(
         status: 200,
         body: {
           'score': Zold::Score::ZERO.to_h,
           'body': File.read(wallet.path)
         }.to_json
       )
-      stub_request(:get, "http://localhost:81/wallet/#{id}").to_return(
+      stub_request(:get, "http://localhost:81/wallet/#{wallet.id}").to_return(
         status: 404
       )
+      remotes = home.remotes
       remotes.add('localhost', 80)
       remotes.add('localhost', 81)
-      copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
-      Zold::Fetch.new(wallets: wallets, copies: copies.root, remotes: remotes, log: test_log).run(
-        ['fetch', '--ignore-score-weakness', id.to_s]
+      copies = home.copies(wallet)
+      Zold::Fetch.new(wallets: home.wallets, copies: copies.root, remotes: remotes, log: test_log).run(
+        ['fetch', '--ignore-score-weakness', wallet.id.to_s]
       )
       assert_equal(copies.all[0][:name], '1')
       assert_equal(copies.all[0][:score], 0)
     end
   end
-
-  def test_fetches_empty_wallet
-    Dir.mktmpdir 'test' do |dir|
-      id = Zold::Id.new
-      wallets = Zold::Wallets.new(dir)
-      remotes = Zold::Remotes.new(File.join(dir, 'remotes.csv'))
-      remotes.clean
-      stub_request(:get, "http://localhost:80/wallet/#{id}").to_return(
-        status: 200,
-        body: {
-          'score': Zold::Score::ZERO.to_h,
-          'body': 'the body'
-        }.to_json
-      )
-      remotes.add('localhost', 80)
-      copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
-      Zold::Fetch.new(
-        wallets: wallets, copies: copies.root, remotes: remotes, log: test_log
-      ).run(['fetch', id.to_s])
-      assert_equal(copies.all[0][:name], '1')
-      assert_equal(copies.all[0][:score], 0)
-    end
-  end
 end

data/test/commands/test_merge.rb

@@ -95,7 +95,7 @@ class TestMerge < Minitest::Test
 
   def test_merges_a_copy_on_top
     FakeHome.new.run do |home|
-      wallet = home.create_wallet
+      wallet = home.create_wallet(Zold::Id::ROOT)
       copies = home.copies(wallet)
       copies.add(File.read(wallet.path), 'good-host', 80, 5)
       key = Zold::Key.new(file: 'fixtures/id_rsa')

data/test/commands/test_node.rb

@@ -44,12 +44,14 @@ class TestNode < Minitest::Test
         wallet = home.create_wallet
         remotes = home.remotes
         remotes.add('localhost', port)
-        Zold::Push.new(wallets: wallets, remotes: remotes, log: test_log).run(['push', '--sync'])
+        Zold::Push.new(wallets: wallets, remotes: remotes, log: test_log).run(
+          ['push', '--ignore-score-weakness']
+        )
         copies = home.copies(wallet)
         Zold::Fetch.new(
           wallets: wallets, copies: copies.root,
           remotes: remotes, log: test_log
-        ).run(['fetch'])
+        ).run(['fetch', '--ignore-score-weakness'])
         assert_equal(1, copies.all.count)
         assert_equal('1', copies.all[0][:name])
       end

data/test/commands/test_push.rb

@@ -37,8 +37,10 @@ class TestPush < Minitest::Test
   def test_pushes_wallet
     FakeHome.new.run do |home|
       wallet = home.create_wallet
-      stub_request(:put, "http://fake-1/wallet/#{wallet.id}").to_return(status: 304)
-      Zold::Push.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
+      remotes = home.remotes
+      remotes.add('localhost', 80)
+      stub_request(:put, "http://localhost:80/wallet/#{wallet.id}").to_return(status: 304)
+      Zold::Push.new(wallets: home.wallets, remotes: remotes, log: test_log).run(
         ['--ignore-this-stupid-option', 'push', wallet.id.to_s]
       )
     end

data/test/node/fake_entrance.rb

@@ -0,0 +1,41 @@
+# 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.
+
+# Fake entrance.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class FakeEntrance
+  def initialize
+    # Nothing here
+  end
+
+  def to_json
+    {}
+  end
+
+  def start
+    yield self
+  end
+
+  def push(id, _)
+    [id]
+  end
+end

data/test/node/fake_node.rb

@@ -24,6 +24,7 @@ require_relative '../fake_home'
 require_relative '../../lib/zold/log'
 require_relative '../../lib/zold/http'
 require_relative '../../lib/zold/verbose_thread'
+require_relative '../../lib/zold/node/front'
 
 # Fake node.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -41,37 +42,44 @@ class FakeNode
   def run(args = ['--standalone'])
     WebMock.allow_net_connect!
     start = Dir.pwd
-    FakeHome.new.run do |home|
-      server = TCPServer.new('127.0.0.1', 0)
-      port = server.addr[1]
-      server.close
-      node = Thread.new do
-        Zold::VerboseThread.new(@log).run do
-          Thread.current.abort_on_exception = true
-          Dir.chdir(home.dir)
-          require_relative '../../lib/zold/commands/node'
-          Zold::Node.new(wallets: home.wallets, remotes: home.remotes, copies: home.copies.root, log: @log).run(
-            [
-              '--port', port.to_s,
-              '--host=localhost',
-              '--bind-port', port.to_s,
-              '--threads=1',
-              '--invoice=NOPREFIX@ffffffffffffffff'
-            ] + args
-          )
+    begin
+      FakeHome.new.run do |home|
+        server = TCPServer.new('127.0.0.1', 0)
+        port = server.addr[1]
+        server.close
+        node = Thread.new do
+          Zold::VerboseThread.new(@log).run do
+            Thread.current.abort_on_exception = true
+            Dir.chdir(home.dir)
+            require_relative '../../lib/zold/commands/node'
+            Zold::Node.new(wallets: home.wallets, remotes: home.remotes, copies: home.copies.root, log: @log).run(
+              [
+                '--network=test',
+                '--port', port.to_s,
+                '--host=localhost',
+                '--bind-port', port.to_s,
+                '--threads=1',
+                '--strength=2',
+                '--routine-immediately',
+                '--invoice=NOPREFIX@ffffffffffffffff'
+              ] + args
+            )
+          end
+        end
+        uri = "http://localhost:#{port}/"
+        while Zold::Http.new(uri).get.code == '599' && node.alive?
+          @log.debug("Waiting for #{uri}...")
+          sleep 1
+        end
+        begin
+          yield port
+        ensure
+          Zold::Front.stop!
+          node.join
         end
       end
-      uri = "http://localhost:#{port}/"
-      while Zold::Http.new(uri).get.code == '599' && node.alive?
-        sleep 1
-        @log.debug("Waiting for #{uri}...")
-      end
-      begin
-        yield port
-      ensure
-        node.exit
-        Dir.chdir(start)
-      end
+    ensure
+      Dir.chdir(start)
     end
   end
 

data/test/node/test_async_entrance.rb

@@ -0,0 +1,88 @@
+# 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 '../fake_home'
+require_relative '../test__helper'
+require_relative '../../lib/zold/id'
+require_relative '../../lib/zold/node/async_entrance'
+require_relative 'fake_entrance'
+
+# AsyncEntrance test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# 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|
+        assert_equal(true, e.to_json[:'pool.running'])
+      end
+    end
+  end
+
+  def test_sends_through
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      amount = Zold::Amount.new(zld: 39.99)
+      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|
+        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'])
+      end
+    end
+  end
+
+  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|
+        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
+
+  class CountingEntrance < FakeEntrance
+    attr_reader :count
+    def initialize
+      @count = 0
+    end
+
+    def push(_, _)
+      @count += 1
+    end
+  end
+
+  class BrokenEntrance < FakeEntrance
+    def push(_, _)
+      raise 'It intentionally crashes'
+    end
+  end
+end

data/test/node/test_entrance.rb

@@ -34,26 +34,8 @@ require_relative '../../lib/zold/commands/pay'
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 class TestEntrance < Minitest::Test
-  def test_renders_json
-    FakeHome.new.run do |home|
-      wallet = home.create_wallet(Zold::Id.new)
-      entrance = Zold::Entrance.new(home.wallets, home.remotes, home.copies(wallet).root, 'x', log: test_log)
-      assert_equal(0, entrance.to_json[:modified])
-    end
-  end
-
-  def test_ignores_duplicates
-    FakeHome.new.run do |home|
-      wallet = home.create_wallet(Zold::Id.new)
-      entrance = Zold::Entrance.new(home.wallets, home.remotes, home.copies(wallet).root, 'x', log: test_log)
-      id = Zold::Id.new.to_s
-      8.times { entrance.spread([Zold::Id.new(id)]) }
-      assert_equal(1, entrance.to_json[:modified])
-    end
-  end
-
   def test_pushes_wallet
-    sid = Zold::Id.new
+    sid = Zold::Id::ROOT
     tid = Zold::Id.new
     body = FakeHome.new.run do |home|
       source = home.create_wallet(sid)

data/test/node/test_front.rb

@@ -25,6 +25,7 @@ require_relative '../test__helper'
 require_relative 'fake_node'
 require_relative '../fake_home'
 require_relative '../../lib/zold/http'
+require_relative '../../lib/zold/json_page'
 require_relative '../../lib/zold/score'
 
 class FrontTest < Minitest::Test
@@ -66,7 +67,7 @@ class FrontTest < Minitest::Test
       ).next.next.next.next
       response = Zold::Http.new("http://localhost:#{port}/remotes", score).get
       body = response.body
-      assert_equal(1, JSON.parse(body)['all'].count, body)
+      assert_equal(1, Zold::JsonPage.new(body).to_hash['all'].count, body)
     end
   end
 
@@ -148,7 +149,7 @@ class FrontTest < Minitest::Test
         "Expected HTTP 200 OK: Found #{response.code}"
       )
       assert_operator(
-        600, :>, response['content-length'].to_i,
+        700, :>, response['content-length'].to_i,
         'Expected the content to be smaller than 600 bytes for gzip'
       )
     end

data/test/node/test_safe_entrance.rb

@@ -0,0 +1,56 @@
+# 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 '../fake_home'
+require_relative '../test__helper'
+require_relative '../../lib/zold/wallet'
+require_relative '../../lib/zold/id'
+require_relative '../../lib/zold/key'
+require_relative '../../lib/zold/node/safe_entrance'
+require_relative 'fake_entrance'
+
+# SafeEntrance test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestSafeEntrance < Minitest::Test
+  def test_rejects_wallet_with_negative_balance
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      amount = Zold::Amount.new(zld: 39.99)
+      key = Zold::Key.new(file: 'fixtures/id_rsa')
+      wallet.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
+      assert_raises StandardError do
+        Zold::SafeEntrance.new(FakeEntrance.new).push(wallet.id, File.read(wallet.path))
+      end
+    end
+  end
+
+  def test_rejects_wallet_with_wrong_network
+    FakeHome.new.run do |home|
+      wallet = Zold::Wallet.new(File.join(home.dir, 'wallet'))
+      wallet.init(Zold::Id.new, Zold::Key.new(file: 'fixtures/id_rsa.pub'), network: 'someothernetwork')
+      assert_raises StandardError do
+        Zold::SafeEntrance.new(FakeEntrance.new).push(wallet.id, File.read(wallet.path))
+      end
+    end
+  end
+end