zold 0.15.0 → 0.16.0

data/test/commands/test_clean.rb

@@ -22,6 +22,7 @@
 
 require 'minitest/autorun'
 require 'time'
+require 'threads'
 require_relative '../fake_home'
 require_relative '../test__helper'
 require_relative '../../lib/zold/copies'
@@ -33,7 +34,7 @@ require_relative '../../lib/zold/commands/clean'
 # License:: MIT
 class TestClean < Minitest::Test
   def test_cleans_copies
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
       copies = home.copies(wallet)
       copies.add('a1', 'host-1', 80, 1, Time.now - 26 * 60 * 60)
@@ -42,4 +43,16 @@ class TestClean < Minitest::Test
       assert(copies.all.empty?)
     end
   end
+
+  def test_cleans_copies_in_threads
+    FakeHome.new(log: test_log).run do |home|
+      wallet = home.create_wallet
+      copies = home.copies(wallet)
+      copies.add(IO.read(wallet.path), 'host-2', 80, 2, Time.now)
+      Threads.new(20).assert do
+        Zold::Clean.new(wallets: home.wallets, copies: copies.root, log: test_log).run(['clean'])
+      end
+      assert_equal(1, copies.all.count)
+    end
+  end
 end

data/test/commands/test_create.rb

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

data/test/commands/test_diff.rb

@@ -40,18 +40,18 @@ require_relative '../../lib/zold/commands/diff'
 # License:: MIT
 class TestDiff < Minitest::Test
   def test_diff_with_copies
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
       first = home.create_wallet
-      File.write(first.path, File.read(wallet.path))
+      IO.write(first.path, IO.read(wallet.path))
       second = home.create_wallet
-      File.write(second.path, File.read(wallet.path))
+      IO.write(second.path, IO.read(wallet.path))
       Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
         ['pay', wallet.id.to_s, "NOPREFIX@#{Zold::Id.new}", '14.95', '--force', '--private-key=fixtures/id_rsa']
       )
       copies = home.copies(wallet)
-      copies.add(File.read(first.path), 'host-1', 80, 5)
-      copies.add(File.read(second.path), 'host-2', 80, 5)
+      copies.add(IO.read(first.path), 'host-1', 80, 5)
+      copies.add(IO.read(second.path), 'host-2', 80, 5)
       diff = Zold::Diff.new(wallets: home.wallets, copies: copies.root, log: test_log).run(
         ['diff', wallet.id.to_s]
       )

data/test/commands/test_fetch.rb

@@ -42,13 +42,13 @@ require_relative '../../lib/zold/commands/fetch'
 # License:: MIT
 class TestFetch < Minitest::Test
   def test_fetches_wallet
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).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),
+          'body': IO.read(wallet.path),
           'mtime': Time.now.utc.iso8601
         }.to_json
       )

data/test/commands/test_merge.rb

@@ -42,18 +42,18 @@ require_relative '../../lib/zold/commands/pay'
 # License:: MIT
 class TestMerge < Minitest::Test
   def test_merges_wallet
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
       first = home.create_wallet
-      File.write(first.path, File.read(wallet.path))
+      IO.write(first.path, IO.read(wallet.path))
       second = home.create_wallet
-      File.write(second.path, File.read(wallet.path))
+      IO.write(second.path, IO.read(wallet.path))
       Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
         ['pay', wallet.id.to_s, "NOPREFIX@#{Zold::Id.new}", '14.95', '--force', '--private-key=fixtures/id_rsa']
       )
       copies = home.copies(wallet)
-      copies.add(File.read(first.path), 'host-1', 80, 5)
-      copies.add(File.read(second.path), 'host-2', 80, 5)
+      copies.add(IO.read(first.path), 'host-1', 80, 5)
+      copies.add(IO.read(second.path), 'host-2', 80, 5)
       modified = Zold::Merge.new(wallets: home.wallets, copies: copies.root, log: test_log).run(
         ['merge', wallet.id.to_s]
       )
@@ -63,18 +63,18 @@ class TestMerge < Minitest::Test
   end
 
   def test_merges_into_empty_wallet
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
       first = home.create_wallet
-      File.write(first.path, File.read(wallet.path))
+      IO.write(first.path, IO.read(wallet.path))
       second = home.create_wallet
-      File.write(second.path, File.read(wallet.path))
+      IO.write(second.path, IO.read(wallet.path))
       Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
         ['pay', wallet.id.to_s, "NOPREFIX@#{Zold::Id.new}", '14.95', '--force', '--private-key=fixtures/id_rsa']
       )
       copies = home.copies(wallet)
-      copies.add(File.read(first.path), 'host-1', 80, 5)
-      copies.add(File.read(second.path), 'host-2', 80, 5)
+      copies.add(IO.read(first.path), 'host-1', 80, 5)
+      copies.add(IO.read(second.path), 'host-2', 80, 5)
       modified = Zold::Merge.new(wallets: home.wallets, copies: copies.root, log: test_log).run(
         ['merge', wallet.id.to_s]
       )
@@ -84,10 +84,10 @@ class TestMerge < Minitest::Test
   end
 
   def test_merges_with_a_broken_copy
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
       copies = home.copies(wallet)
-      copies.add(File.read(wallet.path), 'good-host', 80, 5)
+      copies.add(IO.read(wallet.path), 'good-host', 80, 5)
       copies.add('some garbage', 'bad-host', 80, 5)
       modified = Zold::Merge.new(wallets: home.wallets, copies: copies.root, log: test_log).run(
         ['merge', wallet.id.to_s]
@@ -97,10 +97,10 @@ class TestMerge < Minitest::Test
   end
 
   def test_merges_a_copy_on_top
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet(Zold::Id::ROOT)
       copies = home.copies(wallet)
-      copies.add(File.read(wallet.path), 'good-host', 80, 5)
+      copies.add(IO.read(wallet.path), 'good-host', 80, 5)
       key = Zold::Key.new(file: 'fixtures/id_rsa')
       wallet.sub(Zold::Amount.new(zld: 9.99), "NOPREFIX@#{Zold::Id.new}", key)
       Zold::Merge.new(wallets: home.wallets, copies: copies.root, log: test_log).run(
@@ -111,13 +111,13 @@ class TestMerge < Minitest::Test
   end
 
   def test_rejects_fake_positives_in_new_wallet
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       main = home.create_wallet
       remote = home.create_wallet
-      File.write(remote.path, File.read(main.path))
+      IO.write(remote.path, IO.read(main.path))
       remote.add(Zold::Txn.new(1, Time.now, Zold::Amount.new(zld: 11.0), 'NOPREFIX', Zold::Id.new, 'fake'))
       copies = home.copies(main)
-      copies.add(File.read(remote.path), 'fake-host', 80, 0)
+      copies.add(IO.read(remote.path), 'fake-host', 80, 0)
       Zold::Merge.new(wallets: home.wallets, copies: copies.root, log: test_log).run(
         ['merge', main.id.to_s, '--no-baseline']
       )
@@ -126,7 +126,7 @@ class TestMerge < Minitest::Test
   end
 
   def test_removes_negative_fakes
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
       key = Zold::Key.new(file: 'fixtures/id_rsa')
       wallet.sub(Zold::Amount.new(zld: 9.99), "NOPREFIX@#{Zold::Id.new}", key)
@@ -143,7 +143,7 @@ class TestMerge < Minitest::Test
       Dir.mktmpdir do |dir|
         FileUtils.cp_r(File.join('fixtures/merge', "#{f}/."), dir)
         scores = File.join(dir, "copies/0123456789abcdef/scores#{Zold::Copies::EXT}")
-        File.write(scores, File.read(scores).gsub(/NOW/, Time.now.utc.iso8601))
+        IO.write(scores, IO.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

@@ -44,7 +44,7 @@ class TestNode < Minitest::Test
   #  are always working
   def test_push_and_fetch
     skip
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       FakeNode.new(log: test_log).run do |port|
         wallets = home.wallets
         wallet = home.create_wallet

data/test/commands/test_pay.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'threads'
 require_relative '../test__helper'
 require_relative '../fake_home'
 require_relative '../../lib/zold/wallets'
@@ -35,7 +36,7 @@ require_relative '../../lib/zold/commands/pay'
 # License:: MIT
 class TestPay < Minitest::Test
   def test_sends_from_wallet_to_wallet
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       source = home.create_wallet
       target = home.create_wallet
       amount = Zold::Amount.new(zld: 14.95)
@@ -50,10 +51,10 @@ class TestPay < Minitest::Test
   end
 
   def test_pay_in_many_threads
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
       amount = Zold::Amount.new(zld: 2.0)
-      assert_in_threads(threads: 10) do
+      Threads.new(10).assert do
         Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
           [
             'pay', '--force', '--private-key=fixtures/id_rsa',
@@ -66,7 +67,7 @@ class TestPay < Minitest::Test
   end
 
   def test_sends_from_root_wallet
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       source = home.create_wallet(Zold::Id::ROOT)
       target = home.create_wallet
       amount = Zold::Amount.new(zld: 14.95)
@@ -81,7 +82,7 @@ class TestPay < Minitest::Test
   end
 
   def test_sends_from_normal_wallet
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       source = home.create_wallet
       target = home.create_wallet
       amount = Zold::Amount.new(zld: 14.95)
@@ -102,7 +103,7 @@ class TestPay < Minitest::Test
   end
 
   def test_notifies_about_tax_status
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       source = home.create_wallet
       target = home.create_wallet
       amount = Zold::Amount.new(zld: 14.95)

data/test/commands/test_propagate.rb

@@ -33,7 +33,7 @@ require_relative '../../lib/zold/commands/pay'
 # License:: MIT
 class TestPropagate < Minitest::Test
   def test_propagates_wallet
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
       friend = home.create_wallet
       amount = Zold::Amount.new(zld: 14.95)
@@ -44,6 +44,7 @@ class TestPropagate < Minitest::Test
         ['merge', wallet.id.to_s]
       )
       assert(amount, friend.balance)
+      assert(1, friend.txns.count)
       assert('', friend.txns[0].sign)
     end
   end

data/test/commands/test_pull.rb

@@ -34,7 +34,7 @@ require_relative '../../lib/zold/commands/pull'
 # License:: MIT
 class TestPull < Minitest::Test
   def test_pull_wallet
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       remotes = home.remotes
       remotes.add('localhost', 80)
       json = home.create_wallet_json

data/test/commands/test_push.rb

@@ -37,7 +37,7 @@ require_relative '../../lib/zold/commands/push'
 # License:: MIT
 class TestPush < Minitest::Test
   def test_pushes_wallet
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
       remotes = home.remotes
       remotes.add('localhost', 80)

data/test/commands/test_remove.rb

@@ -0,0 +1,57 @@
+# 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/commands/remove'
+
+# REMOVE test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestRemove < Minitest::Test
+  def test_removes_one_wallet
+    FakeHome.new(log: test_log).run do |home|
+      wallet = home.create_wallet
+      assert_equal(1, home.wallets.all.count)
+      Zold::Remove.new(wallets: home.wallets, log: test_log).run(['remove', wallet.id.to_s])
+      assert(home.wallets.all.empty?)
+    end
+  end
+
+  def test_removes_wallets
+    FakeHome.new(log: test_log).run do |home|
+      home.create_wallet
+      home.create_wallet
+      Zold::Remove.new(wallets: home.wallets, log: test_log).run(['remove'])
+      assert(home.wallets.all.empty?)
+    end
+  end
+
+  def test_removes_no_wallets
+    FakeHome.new(log: test_log).run do |home|
+      Zold::Remove.new(wallets: home.wallets, log: test_log).run(['remove'])
+      assert(home.wallets.all.empty?)
+    end
+  end
+end

data/test/commands/test_taxes.rb

@@ -38,7 +38,7 @@ require_relative '../../lib/zold/commands/taxes'
 # License:: MIT
 class TestTaxes < Minitest::Test
   def test_pays_taxes
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       wallets = home.wallets
       wallet = home.create_wallet
       wallet.add(

data/test/fake_home.rb

@@ -21,10 +21,12 @@
 # SOFTWARE.
 
 require 'tmpdir'
+require_relative '../lib/zold/log'
 require_relative '../lib/zold/id'
 require_relative '../lib/zold/wallet'
 require_relative '../lib/zold/wallets'
 require_relative '../lib/zold/sync_wallets'
+require_relative '../lib/zold/cached_wallets'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/version'
 require_relative '../lib/zold/remotes'
@@ -35,26 +37,27 @@ require_relative '../lib/zold/remotes'
 # License:: MIT
 class FakeHome
   attr_reader :dir
-  def initialize(dir = __dir__)
+  def initialize(dir = __dir__, log: Zold::Log::Quiet.new)
     @dir = dir
+    @log = log
   end
 
   def run
     Dir.mktmpdir do |dir|
-      FileUtils.copy(File.join(__dir__, '../fixtures/id_rsa'), File.join(dir, 'id_rsa'))
-      yield FakeHome.new(dir)
+      FileUtils.copy(File.expand_path(File.join(__dir__, '../fixtures/id_rsa')), File.join(dir, 'id_rsa'))
+      yield FakeHome.new(dir, log: @log)
     end
   end
 
   def wallets
-    Zold::SyncWallets.new(Zold::Wallets.new(@dir), File.join(@dir, 'locks'))
+    Zold::SyncWallets.new(Zold::CachedWallets.new(Zold::Wallets.new(@dir)), log: @log)
   end
 
   def create_wallet(id = Zold::Id.new, dir = @dir)
-    target = Zold::Wallet.new(File.join(dir, id.to_s))
+    target = Zold::Wallet.new(File.join(dir, id.to_s + Zold::Wallet::EXT))
     wallets.find(id) do |w|
-      w.init(id, Zold::Key.new(file: File.join(__dir__, '../fixtures/id_rsa.pub')))
-      File.write(target.path, File.read(w.path))
+      w.init(id, Zold::Key.new(file: File.expand_path(File.join(__dir__, '../fixtures/id_rsa.pub'))))
+      IO.write(target.path, IO.read(w.path))
     end
     target
   end
@@ -73,7 +76,7 @@ class FakeHome
         mtime: wallet.mtime.utc.iso8601,
         digest: wallet.digest,
         balance: wallet.balance.to_i,
-        body: File.read(wallet.path)
+        body: IO.read(wallet.path)
       }.to_json
     end
   end

data/test/node/fake_node.rb

@@ -38,9 +38,9 @@ class FakeNode
     @log = log
   end
 
-  def run(args = ['--standalone'])
+  def run(args = ['--standalone', '--no-metronome'])
     WebMock.allow_net_connect!
-    FakeHome.new.run do |home|
+    FakeHome.new(log: @log).run do |home|
       RandomPort::Pool::SINGLETON.acquire do |port|
         node = Thread.new do
           Zold::VerboseThread.new(@log).run do

data/test/node/test_async_entrance.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'threads'
 require_relative '../fake_home'
 require_relative '../test__helper'
 require_relative '../../lib/zold/id'
@@ -33,33 +34,48 @@ require_relative 'fake_entrance'
 # License:: MIT
 class TestAsyncEntrance < Minitest::Test
   def test_renders_json
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).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
   end
 
-  def test_sends_through
-    FakeHome.new.run do |home|
+  def test_sends_through_once
+    FakeHome.new(log: test_log).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, File.join(home.dir, 'a/b/c'), log: test_log).start do |e|
-        5.times { e.push(wallet.id, File.read(wallet.path)) }
-        assert_equal_wait(false) { basic.count.zero? }
-        assert(!basic.count.zero?)
+        e.push(wallet.id, IO.read(wallet.path))
+        assert_equal_wait(1) { basic.count }
+      end
+    end
+  end
+
+  def test_sends_through
+    FakeHome.new(log: test_log).run do |home|
+      basic = CountingEntrance.new
+      Zold::AsyncEntrance.new(basic, File.join(home.dir, 'a/b/c'), log: test_log).start do |e|
+        Threads.new(20).assert do
+          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)
+          5.times { e.push(wallet.id, IO.read(wallet.path)) }
+        end
       end
+      assert_equal_wait(true) { basic.count >= 20 }
     end
   end
 
   def test_handles_broken_entrance_gracefully
-    FakeHome.new.run do |home|
+    FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
       Zold::AsyncEntrance.new(BrokenEntrance.new, home.dir, log: test_log).start do |e|
-        e.push(wallet.id, File.read(wallet.path))
+        e.push(wallet.id, IO.read(wallet.path))
       end
     end
   end