zold 0.14.28 → 0.14.29

data/test/node/test_async_entrance.rb

@@ -49,7 +49,7 @@ class TestAsyncEntrance < Minitest::Test
       basic = CountingEntrance.new
       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 while basic.count.zero?
+        assert_equal_wait(false) { basic.count.zero? }
         assert(!basic.count.zero?)
       end
     end

data/test/node/test_farm.rb

@@ -41,7 +41,7 @@ class FarmTest < Minitest::Test
     Dir.mktmpdir do |dir|
       farm = Zold::Farm.new('NOPREFIX6@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
       farm.start('localhost', 80, threads: 4, strength: 2) do
-        sleep 0.1 while farm.best.empty? || farm.best[0].value.zero?
+        assert_wait { !farm.best.empty? && !farm.best[0].value.zero? }
         count = 0
         100.times { count += farm.to_json[:best].length }
         assert(count.positive?)
@@ -62,7 +62,7 @@ class FarmTest < Minitest::Test
     Dir.mktmpdir do |dir|
       farm = Zold::Farm.new('NOPREFIX1@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
       farm.start('localhost', 80, threads: 4, strength: 3) do
-        sleep 0.1 while farm.best.empty? || farm.best[0].value < 3
+        assert_wait { !farm.best.empty? && farm.best[0].value >= 3 }
         score = farm.best[0]
         assert(!score.expired?)
         assert(score.value >= 3)

data/test/node/test_front.rb

@@ -42,7 +42,8 @@ class FrontTest < Minitest::Test
           '/version',
           '/farm',
           '/metronome',
-          '/score'
+          '/score',
+          '/trace'
         ],
         '404' => [
           '/this-is-absent',
@@ -76,12 +77,11 @@ class FrontTest < Minitest::Test
     FakeHome.new.run do |home|
       FakeNode.new(log: test_log).run(['--ignore-score-weakness', '--standalone']) do |port|
         wallet = home.create_wallet
-        test_log.debug("Wallet created: #{wallet.id}")
-        home = "http://localhost:#{port}"
-        response = Zold::Http.new(uri: "#{home}/wallet/#{wallet.id}?sync=true", score: nil)
+        base = "http://localhost:#{port}"
+        response = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil)
           .put(File.read(wallet.path))
         assert_equal('200', response.code, response.body)
-        sleep 0.1 until Zold::Http.new(uri: "#{home}/wallet/#{wallet.id}", score: nil).get.code == '200'
+        assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).get.code }
         [
           "/wallet/#{wallet.id}.txt",
           "/wallet/#{wallet.id}.json",
@@ -92,27 +92,24 @@ class FrontTest < Minitest::Test
           "/wallet/#{wallet.id}.bin",
           "/wallet/#{wallet.id}/copies"
         ].each do |u|
-          res = Zold::Http.new(uri: "#{home}#{u}", score: nil).get
-          assert_equal('200', res.code, res.body)
+          assert_equal_wait('200') { Zold::Http.new(uri: "#{base}#{u}", score: nil).get.code }
         end
       end
     end
   end
 
-  # @todo #239:30min This tests is skipped since it crashes sporadically.
-  #  Let's investigate and make it stable. I don't really know what's going
-  #  on, but suspect some collision between threads:
-  #  http://www.rultor.com/t/14940-397702802
   def test_pushes_twice
-    skip
     FakeNode.new(log: test_log).run do |port|
       FakeHome.new.run do |home|
         wallet = home.create_wallet
-        response = Zold::Http.new(uri: "http://localhost:#{port}/wallet/#{wallet.id}?sync=true", score: nil)
-          .put(File.read(wallet.path))
-        assert_equal('200', response.code, response.body)
+        base = "http://localhost:#{port}"
+        assert_equal(
+          '200',
+          Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).put(File.read(wallet.path)).code
+        )
+        assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).get.code }
         3.times do
-          r = Zold::Http.new(uri: "http://localhost:#{port}/wallet/#{wallet.id}?sync=true", score: nil)
+          r = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil)
             .put(File.read(wallet.path))
           assert_equal('304', r.code, r.body)
         end
@@ -120,6 +117,34 @@ class FrontTest < Minitest::Test
     end
   end
 
+  def test_pushes_many_wallets
+    FakeNode.new(log: test_log).run do |port|
+      base = "http://localhost:#{port}"
+      FakeHome.new.run do |home|
+        threads = 20
+        done = Concurrent::AtomicFixnum.new
+        pool = Concurrent::FixedThreadPool.new(threads)
+        latch = Concurrent::CountDownLatch.new(1)
+        threads.times do |i|
+          pool.post do
+            Thread.current.name = "thread-#{i}"
+            Zold::VerboseThread.new(test_log).run(true) do
+              latch.wait(10)
+              wallet = home.create_wallet
+              Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).put(File.read(wallet.path))
+              assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).get.code }
+              done.increment
+            end
+          end
+        end
+        latch.count_down
+        pool.shutdown
+        pool.wait_for_termination
+        assert_equal(threads, done.value)
+      end
+    end
+  end
+
   def test_different_logos
     {
       '0' => 'https://www.zold.io/images/logo-red.png',
@@ -257,6 +282,27 @@ class FrontTest < Minitest::Test
         Zold::Http.new(uri: uri, score: nil).get
       end
     end
-    assert_equal('--alias should be a 4 to 16 char long alphanumeric string', exception.message)
+    assert(exception.message.include?('should be a 4 to 16 char long alphanumeric string'))
+  end
+
+  def test_push_fetch_in_multiple_threads
+    key = Zold::Key.new(text: File.read('fixtures/id_rsa'))
+    FakeNode.new(log: test_log).run do |port|
+      FakeHome.new.run do |home|
+        wallet = home.create_wallet(Zold::Id::ROOT)
+        base = "http://localhost:#{port}"
+        Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).put(File.read(wallet.path))
+        assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).get.code }
+        cycles = 50
+        cycles.times do
+          wallet.sub(Zold::Amount.new(coins: 10), "NOPREFIX@#{Zold::Id.new}", key)
+          Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).put(File.read(wallet.path))
+          assert_equal('200', Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).get.code)
+        end
+        assert_equal_wait(-10 * cycles) do
+          Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}/balance", score: nil).get.body.to_i
+        end
+      end
+    end
   end
 end

data/test/node/test_sync_entrance.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# 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/node/sync_entrance'
+require_relative 'fake_entrance'
+
+# SyncEntrance test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestSyncEntrance < Minitest::Test
+  def test_renders_json
+    FakeHome.new.run do
+      Zold::SyncEntrance.new(FakeEntrance.new, log: test_log).start do |e|
+        assert(!e.to_json.nil?)
+      end
+    end
+  end
+end

data/test/node/test_trace.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# 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/node/trace'
+
+class TraceTest < Minitest::Test
+  def test_records_log_lines
+    trace = Zold::Trace.new(test_log, 2)
+    trace.error('This should not be visible')
+    trace.error('How are you, друг?')
+    trace.error('Works?')
+    assert(!trace.to_s.include?('visible'))
+    assert(trace.to_s.include?('друг'))
+  end
+end

data/test/test__helper.rb

@@ -37,6 +37,24 @@ end
 
 module Minitest
   class Test
+    def assert_wait(max: 30)
+      assert_equal_wait(true, max: max) { yield }
+    end
+
+    def assert_equal_wait(expected, max: 30)
+      start = Time.now
+      loop do
+        actual = yield
+        if expected == actual
+          assert_equal(expected, actual)
+          break
+        end
+        sleep 1
+        sec = Time.now - start
+        raise "'#{actual}' is not equal to '#{expected}' even after #{sec.round}s of waiting" if sec > max
+      end
+    end
+
     def test_log
       require_relative '../lib/zold/log'
       @test_log = Zold::Log::Verbose.new

data/test/test_copies.rb

@@ -125,7 +125,7 @@ class TestCopies < Minitest::Test
       wallet = home.create_wallet(id)
       amount = Zold::Amount.new(zld: 1.99)
       key = Zold::Key.new(file: 'fixtures/id_rsa')
-      wallet.sub(amount, "NOPREFIX@#{id}", key, text, time: Time.parse('2018-01-01T01:01:01Z'))
+      wallet.sub(amount, 'NOPREFIX@0000111122223333', key, text, time: Time.parse('2018-01-01T01:01:01Z'))
       File.read(wallet.path)
     end
   end

data/test/test_metronome.rb

@@ -34,8 +34,7 @@ class TestMetronome < Minitest::Test
     list = []
     metronome.add(FakeRoutine.new(list))
     metronome.start do
-      sleep 0.1 while list.empty?
-      assert_equal(1, list.count)
+      assert_wait { !list.empty? }
     end
   end
 
@@ -52,7 +51,7 @@ class TestMetronome < Minitest::Test
     routine = BrokenRoutine.new
     metronome.add(routine)
     metronome.start do
-      sleep 0.1 while routine.count < 2
+      assert_wait { routine.count >= 2 }
       assert(routine.count > 1)
     end
   end

data/test/test_patch.rb

@@ -47,7 +47,7 @@ class TestPatch < Minitest::Test
       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.0), "NOPREFIX@#{Zold::Id.new}", key)
-      third.add(t.inverse(first.id))
+      third.add(t.inverse(Zold::Id.new))
       patch = Zold::Patch.new(home.wallets, log: test_log)
       patch.join(first)
       patch.join(second)

data/test/test_remotes.rb

@@ -183,7 +183,7 @@ class TestRemotes < Minitest::Test
           end
         end
       end
-      sleep 0.1 while cycles.value < 50
+      assert_wait { cycles.value >= 50 }
       alive = false
       pool.shutdown
       pool.wait_for_termination
@@ -210,7 +210,7 @@ class TestRemotes < Minitest::Test
         end
       end
       latch.count_down
-      sleep 0.1 until done.value == threads
+      assert_equal_wait(threads) { done.value }
       assert_equal(threads, remotes.all.count)
     end
   end
@@ -239,7 +239,7 @@ class TestRemotes < Minitest::Test
           end
         end
       end
-      sleep 0.1 while done.value < 1000
+      assert_wait { done.value >= 1000 }
       alive = false
       pool.shutdown
       pool.wait_for_termination(10)

data/test/test_sync_wallets.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+# 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 'concurrent'
+require_relative 'test__helper'
+require_relative 'fake_home'
+require_relative '../lib/zold/key'
+require_relative '../lib/zold/id'
+require_relative '../lib/zold/wallets'
+require_relative '../lib/zold/sync_wallets'
+require_relative '../lib/zold/amount'
+
+# SyncWallets test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestSyncWallets < Minitest::Test
+  def test_adds_wallet
+    FakeHome.new.run do |home|
+      wallets = home.wallets
+      id = Zold::Id.new
+      home.create_wallet(id)
+      key = Zold::Key.new(file: 'fixtures/id_rsa')
+      amount = Zold::Amount.new(zld: 5.0)
+      threads = 10
+      pool = Concurrent::FixedThreadPool.new(threads)
+      latch = Concurrent::CountDownLatch.new(1)
+      threads.times do |i|
+        pool.post do
+          Thread.current.name = "thread-#{i}"
+          Zold::VerboseThread.new(test_log).run(true) do
+            latch.wait(10)
+            wallets.find(id) do |wallet|
+              wallet.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
+              wallet.refurbish
+            end
+          end
+        end
+      end
+      latch.count_down
+      pool.shutdown
+      pool.wait_for_termination
+      assert_equal_wait(amount * threads * -1, max: 4) do
+        wallets.find(id, &:balance)
+      end
+      assert_equal(5, Dir.new(wallets.path).count)
+    end
+  end
+end

data/test/test_wallet.rb

@@ -112,7 +112,7 @@ class TestWallet < Minitest::Test
       amount = Zold::Amount.new(zld: 39.99)
       key = Zold::Key.new(file: 'fixtures/id_rsa')
       txn = wallet.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
-      wallet.add(txn.inverse(wallet.id))
+      wallet.add(txn.inverse(Zold::Id.new))
       assert(!Zold::Wallet.new(wallet.path).txns[1].sign.end_with?("\n"))
     end
   end

data/test/test_wallets.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'tmpdir'
 require_relative 'fake_home'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/id'
@@ -36,9 +37,10 @@ class TestWallets < Minitest::Test
     FakeHome.new.run do |home|
       wallets = home.wallets
       id = Zold::Id.new
-      wallet = wallets.find(id)
-      wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      assert_equal(1, wallets.all.count)
+      wallets.find(id) do |wallet|
+        wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+        assert_equal(1, wallets.all.count)
+      end
     end
   end
 
@@ -47,17 +49,19 @@ class TestWallets < Minitest::Test
       wallets = home.wallets
       FileUtils.touch(File.join(home.dir, '0xaaaaaaaaaaaaaaaaaaahello'))
       id = Zold::Id.new
-      wallet = wallets.find(id)
-      wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      assert_equal(1, wallets.all.count)
+      wallets.find(id) do |wallet|
+        wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+        assert_equal(1, wallets.all.count)
+      end
     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))
+    Dir.mktmpdir do |dir|
+      Dir.chdir(dir) do
+        wallets = Zold::Wallets.new(Dir.pwd)
+        assert_equal('.', wallets.to_s)
+      end
     end
   end
 end