zold 0.20.1 → 0.20.2

data/lib/zold/txns.rb

@@ -46,23 +46,23 @@ module Zold
         .map { |line, i| Txn.parse(line, i + 6) }
         .sort
     end
+  end
 
-    # Cached transactions.
-    # Author:: Yegor Bugayenko (yegor256@gmail.com)
-    # Copyright:: Copyright (c) 2018 Yegor Bugayenko
-    # License:: MIT
-    class Cached
-      def initialize(txns)
-        @txns = txns
-      end
+  # Cached transactions.
+  # Author:: Yegor Bugayenko (yegor256@gmail.com)
+  # Copyright:: Copyright (c) 2018 Yegor Bugayenko
+  # License:: MIT
+  class CachedTxns
+    def initialize(txns)
+      @txns = txns
+    end
 
-      def flush
-        @fetch = nil
-      end
+    def flush
+      @fetch = nil
+    end
 
-      def fetch
-        @fetch ||= @txns.fetch
-      end
+    def fetch
+      @fetch ||= @txns.fetch
     end
   end
 end

data/lib/zold/verbose_thread.rb

@@ -21,7 +21,9 @@
 # SOFTWARE.
 
 require 'backtrace'
+require 'get_process_mem'
 require_relative 'log'
+require_relative 'size'
 
 # Verbose thread.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -37,6 +39,11 @@ module Zold
     def run(safe = false)
       Thread.current.report_on_exception = false
       yield
+    rescue Errno::ENOMEM => e
+      @log.error(Backtrace.new(e).to_s)
+      @log.error("We are too big in memory (#{Size.new(GetProcessMem.new.bytes.to_i)}), quitting; \
+this is not a normal behavior, you may want to report a bug to our GitHub repository")
+      abort
     rescue StandardError => e
       @log.error(Backtrace.new(e).to_s)
       raise e unless safe

data/lib/zold/version.rb

@@ -25,7 +25,7 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.20.1'
+  VERSION = '0.20.2'
   PROTOCOL = 2
   REPO = 'zold-io/zold'
 end

data/lib/zold/wallet.rb

@@ -59,8 +59,8 @@ module Zold
         raise "Wallet file must end with #{Wallet::EXT} or #{Copies::EXT}: #{file}"
       end
       @file = File.absolute_path(file)
-      @txns = Txns::Cached.new(Txns.new(@file))
-      @head = Head::Cached.new(Head.new(@file))
+      @txns = CachedTxns.new(Txns.new(@file))
+      @head = CachedHead.new(Head.new(@file))
     end
 
     def ==(other)

data/test/commands/routines/test_audit.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 'tmpdir'
+require 'webmock/minitest'
+require_relative '../../test__helper'
+require_relative '../../../lib/zold/commands/routines/audit.rb'
+
+# Audit test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestAudit < Zold::Test
+  def test_audits
+    FakeHome.new(log: test_log).run do |home|
+      opts = { 'routine-immediately' => true }
+      routine = Zold::Routines::Audit.new(opts, home.wallets, log: test_log)
+      routine.exec
+    end
+  end
+end

data/test/commands/test_clean.rb

@@ -37,8 +37,8 @@ class TestClean < Zold::Test
     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)
-      copies.add('a2', 'host-2', 80, 2, Time.now - 26 * 60 * 60)
+      copies.add('a1', 'host-1', 80, 1, time: Time.now - 26 * 60 * 60)
+      copies.add('a2', 'host-2', 80, 2, time: Time.now - 26 * 60 * 60)
       Zold::Clean.new(wallets: home.wallets, copies: copies.root, log: test_log).run(['clean', wallet.id.to_s])
       assert(copies.all.empty?)
     end
@@ -63,7 +63,7 @@ class TestClean < Zold::Test
     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)
+      copies.add(IO.read(wallet.path), 'host-2', 80, 2, time: Time.now)
       Threads.new(20).assert do
         Zold::Clean.new(wallets: home.wallets, copies: copies.root, log: test_log).run(['clean'])
       end

data/test/node/fake_node.rb

@@ -57,6 +57,7 @@ class FakeNode
                 '--threads=1',
                 '--dump-errors',
                 '--strength=2',
+                '--halt-code=test',
                 '--routine-immediately',
                 '--invoice=NOPREFIX@ffffffffffffffff'
               ] + args
@@ -77,7 +78,7 @@ class FakeNode
         begin
           yield port
         ensure
-          Zold::Front.stop!
+          Zold::Http.new(uri: uri + '?halt=test').get
           node.join
         end
       end

data/test/node/test_async_entrance.rb

@@ -74,8 +74,10 @@ class TestAsyncEntrance < Zold::Test
   def test_handles_broken_entrance_gracefully
     FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
+      id = wallet.id
+      body = IO.read(wallet.path)
       Zold::AsyncEntrance.new(BrokenEntrance.new, home.dir, log: test_log).start do |e|
-        e.push(wallet.id, IO.read(wallet.path))
+        e.push(id, body)
       end
     end
   end

data/test/node/test_front.rb

@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'eventmachine'
 require 'minitest/autorun'
 require 'json'
 require 'time'

data/test/node/test_sync_entrance.rb

@@ -32,8 +32,8 @@ require_relative 'fake_entrance'
 # License:: MIT
 class TestSyncEntrance < Zold::Test
   def test_renders_json
-    FakeHome.new(log: test_log).run do
-      Zold::SyncEntrance.new(FakeEntrance.new, log: test_log).start do |e|
+    FakeHome.new(log: test_log).run do |home|
+      Zold::SyncEntrance.new(FakeEntrance.new, File.join(home.dir, 'x'), log: test_log).start do |e|
         assert(!e.to_json.nil?)
       end
     end

data/test/test_copies.rb

@@ -70,11 +70,20 @@ class TestCopies < Zold::Test
     end
   end
 
+  def test_master_first
+    Dir.mktmpdir do |dir|
+      copies = Zold::Copies.new(File.join(dir, 'my/a/copies-2'), log: test_log)
+      copies.add(content('z1'), 'master', 80, 100, master: false)
+      copies.add(content('z2'), 'edge', 80, 1, master: true)
+      assert(copies.all[0][:master])
+    end
+  end
+
   def test_cleans_copies
     Dir.mktmpdir do |dir|
       copies = Zold::Copies.new(dir, log: test_log)
-      copies.add(content('h1'), 'zold.io', 4096, 10, Time.now - 25 * 60 * 60)
-      copies.add(content('h1'), 'zold.io', 4097, 20, Time.now - 26 * 60 * 60)
+      copies.add(content('h1'), 'zold.io', 4096, 10, time: Time.now - 25 * 60 * 60)
+      copies.add(content('h1'), 'zold.io', 4097, 20, time: Time.now - 26 * 60 * 60)
       assert(File.exist?(File.join(dir, "1#{Zold::Copies::EXT}")))
       copies.clean
       assert(copies.all.empty?, "#{copies.all.count} is not empty")
@@ -85,7 +94,7 @@ class TestCopies < Zold::Test
   def test_cleans_broken_copies
     Dir.mktmpdir do |dir|
       copies = Zold::Copies.new(dir, log: test_log)
-      copies.add('broken wallet content', 'zold.io', 4096, 10, Time.now)
+      copies.add('broken wallet content', 'zold.io', 4096, 10, time: Time.now)
       copies.clean
       assert(copies.all.empty?, "#{copies.all.count} is not empty")
     end
@@ -94,7 +103,7 @@ class TestCopies < Zold::Test
   def test_ignores_garbage
     Dir.mktmpdir do |dir|
       copies = Zold::Copies.new(dir, log: test_log)
-      copies.add(content('h1'), 'zold.io', 50, 80, Time.now - 25 * 60 * 60)
+      copies.add(content('h1'), 'zold.io', 50, 80, time: Time.now - 25 * 60 * 60)
       FileUtils.mkdir(File.join(dir, '55'))
       assert_equal(1, copies.all.count)
     end
@@ -114,7 +123,7 @@ class TestCopies < Zold::Test
   def test_ignores_too_old_scores
     Dir.mktmpdir do |dir|
       copies = Zold::Copies.new(dir, log: test_log)
-      copies.add(content('h1'), 'zold.io', 50, 80, Time.now - 1000 * 60 * 60)
+      copies.add(content('h1'), 'zold.io', 50, 80, time: Time.now - 1000 * 60 * 60)
       assert_equal(0, copies.all[0][:score])
     end
   end

data/test/test_tree_wallets.rb

@@ -23,6 +23,7 @@
 require 'minitest/autorun'
 require 'tmpdir'
 require_relative 'test__helper'
+require_relative '../lib/zold/wallet'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/id'
 require_relative '../lib/zold/tree_wallets'
@@ -59,15 +60,24 @@ class TestTreeWallets < Zold::Test
   end
 
   def test_count_tree_wallets
+    files = [
+      "0000111122223333#{Zold::Wallet::EXT}",
+      "a/b/d/e/0000111122223333#{Zold::Wallet::EXT}",
+      "a/b/0000111122223333#{Zold::Wallet::EXT}"
+    ]
+    garbage = [
+      '0000111122223333',
+      '0000111122223333.lock',
+      'a/b/c-0000111122223333'
+    ]
     Dir.mktmpdir do |dir|
-      Dir.chdir(dir) do
-        5.times { |i| FileUtils.touch("wallet_#{i}.z") }
-        Dir.mktmpdir(nil, dir) do |subdir|
-          5.times { |i| FileUtils.touch("#{subdir}/wallet_#{i}.z") }
-          wallets = Zold::TreeWallets.new(Dir.pwd)
-          assert_equal(10, wallets.count)
-        end
+      (files + garbage).each do |f|
+        path = File.join(dir, f)
+        FileUtils.mkdir_p(File.dirname(path))
+        FileUtils.touch(path)
       end
+      wallets = Zold::TreeWallets.new(dir)
+      assert_equal(files.count, wallets.count)
     end
   end
 end

data/test/test_txn.rb

@@ -73,4 +73,12 @@ class TestTxn < Zold::Test
     )
     assert_equal(details, txn.details)
   end
+
+  def test_prints_and_parses_time
+    10.times do |i|
+      time = Time.now + i * 12_345
+      iso = time.utc.iso8601
+      assert_equal(time.to_s, Zold::Txn.parse_time(iso).to_s)
+    end
+  end
 end

data/test/test_wallet.rb

@@ -280,4 +280,21 @@ class TestWallet < Zold::Test
       end
     end
   end
+
+  def test_collects_memory_garbage
+    require 'get_process_mem'
+    start = GetProcessMem.new.bytes.to_i
+    40.times do |i|
+      wallet = Zold::Wallet.new('fixtures/448b451bc62e8e16.z')
+      GC.start
+      wallet.id
+      wallet.txns.count
+      test_log.debug("Memory: #{GetProcessMem.new.bytes.to_i}") if (i % 5).zero?
+    end
+    GC.stress = true
+    diff = GetProcessMem.new.bytes.to_i - start
+    GC.stress = false
+    test_log.debug("Memory diff is #{diff}")
+    assert(diff < 20_000_000)
+  end
 end

data/zold.gemspec

@@ -83,7 +83,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'typhoeus', '1.3.1'
   s.add_runtime_dependency 'usagewatch_ext', '0.2.1'
   s.add_runtime_dependency 'xcop', '>=0.6'
-  s.add_runtime_dependency 'zache', '>=0.5.3'
+  s.add_runtime_dependency 'zache', '>=0.7.0'
   s.add_runtime_dependency 'zold-score', '0.4.4'
   s.add_development_dependency 'codecov', '0.1.13'
   s.add_development_dependency 'minitest', '5.11.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2018-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -324,14 +324,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: zold-score
   requirement: !ruby/object:Gem::Requirement
@@ -562,6 +562,7 @@ files:
 - lib/zold/commands/push.rb
 - lib/zold/commands/remote.rb
 - lib/zold/commands/remove.rb
+- lib/zold/commands/routines/audit.rb
 - lib/zold/commands/routines/gc.rb
 - lib/zold/commands/routines/reconnect.rb
 - lib/zold/commands/show.rb
@@ -612,6 +613,7 @@ files:
 - lib/zold/wallets.rb
 - resources/masters
 - resources/root.pub
+- test/commands/routines/test_audit.rb
 - test/commands/routines/test_gc.rb
 - test/commands/routines/test_reconnect.rb
 - test/commands/test_alias.rb
@@ -690,7 +692,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.20.1!
+  Thanks for installing Zold 0.20.2!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try online wallet at: https://wts.zold.io
@@ -722,6 +724,7 @@ test_files:
 - features/gem_package.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
+- test/commands/routines/test_audit.rb
 - test/commands/routines/test_gc.rb
 - test/commands/routines/test_reconnect.rb
 - test/commands/test_alias.rb