zold 0.26.15 → 0.26.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f13f402152afeb770656e632fff9b86f48f4bb99669da498b74f4d78e42dca9
-  data.tar.gz: 26e4591a34a4b9b7405181b584df64e04290c62777620ccac4ebf5afa85d8270
+  metadata.gz: 7b0ae546cf6416b998bfd75490dae5b662d89c3e6e598958f1c73c86e51fda17
+  data.tar.gz: bcc69294f383f7832b3ac832742c89630eb7d8a880741aefd7c0397a88cb9042
 SHA512:
-  metadata.gz: 3bb478289ca360a81006c2d7eeac834e87fe08805a7374086cd0996babb2099122ef769131ea98c8d59a6d2d2fa9ea9156db6a9457642a2b6dabd8efdbf56b8a
-  data.tar.gz: 2b82edcc6fc0ebd2bbeea606ab24206dd6358bbf6472ddcb3ca7e5869f2b79df07253786e0f123abb56c2c3541999f465187e98eb4a1be6894245bd74b5af014
+  metadata.gz: f746fba3dad2802bce2170facba75809d44fee26f29cf61a95c1c74245c61668f1fd75fed47722ab50bfc7676093b287b16e4e1683b280f99fd18715321e8574
+  data.tar.gz: fe15c859e3ff938901b7ef369e80346dc005be4451e4c2abd2cd45bd778b0b5b8939c3d0201ae78e4802c8d3aec6475779d94ab96a12857eec61e3e8d9476a7b

data/.rubocop.yml

@@ -20,7 +20,7 @@ Metrics/BlockNesting:
 Metrics/BlockLength:
   Max: 130
 Metrics/ClassLength:
-  Max: 500
+  Max: 600
 Layout/EndOfLine:
   EnforcedStyle: lf
 Metrics/ParameterLists:

data/lib/zold/commands/fetch.rb

@@ -171,7 +171,7 @@ run 'zold remote update' or use --tolerate-quorum=1"
               raise "The balance of #{id} is #{wallet.balance} and it's not a root wallet"
             end
             copy = cps.add(IO.read(f), score.host, score.port, score.value, master: r.master?)
-            @log.info("#{r} returned #{wallet.mnemo} #{Age.new(json['mtime'])}/#{json['copies']}c \
+            @log.debug("#{r} returned #{wallet.mnemo} #{Age.new(json['mtime'])}/#{json['copies']}c \
 as copy ##{copy}/#{cps.all.count} in #{Age.new(start, limit: 4)}: \
 #{Rainbow(score.value).green} (#{json['version']})")
           end

data/lib/zold/commands/node.rb

@@ -45,6 +45,7 @@ require_relative '../node/async_entrance'
 require_relative '../node/sync_entrance'
 require_relative '../node/nodup_entrance'
 require_relative '../node/nospam_entrance'
+require_relative '../node/journaled_entrance'
 require_relative '../node/front'
 require_relative '../node/trace'
 require_relative '../node/farm'
@@ -235,10 +236,10 @@ the node won\'t connect to the network like that; try to do "zold remote reset"
 #{@remotes.all.map { |r| "#{r[:host]}:#{r[:port]}" }.join(', ')}")
       @log.info("Wallets at: #{@wallets.path}")
       if opts['standalone']
-        @remotes = Zold::Remotes::Empty.new
+        @remotes = Remotes::Empty.new
         @log.info('Running in standalone mode! (will never talk to other remotes)')
       elsif @remotes.exists?(host, port)
-        Zold::Remote.new(remotes: @remotes).run(['remote', 'remove', host, port.to_s])
+        Remote.new(remotes: @remotes).run(['remote', 'remove', host, port.to_s])
         @log.info("Removed current node (#{address}) from list of remotes")
       end
       if File.exist?(@copies)
@@ -249,8 +250,8 @@ the node won\'t connect to the network like that; try to do "zold remote reset"
       if opts['not-hungry']
         @log.info('Hungry pulling disabled because of --not-hungry')
       else
-        hungry = Zold::ThreadPool.new('hungry', log: @log)
-        wts = Zold::HungryWallets.new(@wallets, @remotes, @copies, hungry, log: @log, network: opts['network'])
+        hungry = ThreadPool.new('hungry', log: @log)
+        wts = HungryWallets.new(@wallets, @remotes, @copies, hungry, log: @log, network: opts['network'])
       end
       Front.set(:zache, Zache.new(dirty: true))
       Front.set(:wallets, wts)
@@ -266,17 +267,29 @@ the node won\'t connect to the network like that; try to do "zold remote reset"
       async_dir = File.join(home, '.zoldata/async-entrance')
       FileUtils.mkdir_p(async_dir)
       Front.set(:async_dir, async_dir)
+      journal_dir = File.join(home, '.zoldata/journal')
+      FileUtils.mkdir_p(journal_dir)
+      Front.set(:journal_dir, journal_dir)
       Front.set(:node_alias, node_alias(opts, address))
+      jlog = Logger.new(File.join(journal_dir, 'journal'))
+      jlog.level = Logger::DEBUG
+      jlog.formatter = Log::COMPACT
       entrance = SafeEntrance.new(
         NoSpamEntrance.new(
           NoDupEntrance.new(
             AsyncEntrance.new(
               SpreadEntrance.new(
                 SyncEntrance.new(
-                  Entrance.new(
-                    wts, @remotes, @copies, address,
-                    ledger: ledger,
-                    log: @log, network: opts['network']
+                  JournaledEntrance.new(
+                    Entrance.new(
+                      wts, @remotes, @copies, address,
+                      ledger: ledger,
+                      log: Log::Tee.new(@log, jlog), network: opts['network']
+                    ),
+                    wts,
+                    journal_dir,
+                    jlog,
+                    'journal'
                   ),
                   File.join(home, '.zoldata/sync-entrance'),
                   log: @log

data/lib/zold/commands/push.rb

@@ -135,10 +135,8 @@ out of #{nodes.value} in #{Age.new(start)}, total score for #{id} is #{total.val
         r.assert_valid_score(score)
         r.assert_score_ownership(score)
         r.assert_score_strength(score) unless opts['ignore-score-weakness']
-        if @log.info?
-          @log.info("#{r} accepted #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 4)}: \
+        @log.debug("#{r} accepted #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 4)}: \
 #{Rainbow(score.value).green} (#{json['version']})")
-        end
         score.value
       end
     end
@@ -153,7 +151,7 @@ out of #{nodes.value} in #{Age.new(start)}, total score for #{id} is #{total.val
           r.http(uri).put(f)
         end
         if response.status == 304
-          @log.info("#{r}: same version of #{@wallets.acq(id, &:mnemo)} there, didn't push \
+          @log.debug("#{r}: same version of #{@wallets.acq(id, &:mnemo)} there, didn't push \
 in #{Age.new(start, limit: 0.5)}")
           return 0
         end
@@ -164,7 +162,7 @@ in #{Age.new(start, limit: 0.5)}")
       rescue JsonPage::CantParse, Score::CantParse, RemoteNode::CantAssert => e
         attempt += 1
         if attempt < opts['retry']
-          @log.error("#{r} failed to push #{id}, trying again (attempt no.#{attempt}): #{e.message}")
+          @log.debug("#{r} failed to push #{id}, trying again (attempt no.#{attempt}): #{e.message}")
           retry
         end
         raise e

data/lib/zold/commands/remote.rb

@@ -316,7 +316,7 @@ Available options:"
       rescue JsonPage::CantParse, Score::CantParse, RemoteNode::CantAssert => e
         attempt += 1
         if attempt < opts['retry']
-          @log.error("#{r} failed to read, trying again (attempt no.#{attempt}): #{e.message}")
+          @log.debug("#{r} failed to read, trying again (attempt no.#{attempt}): #{e.message}")
           retry
         end
         raise e
@@ -354,7 +354,7 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
         @remotes.remove(r[:host], r[:port])
         @log.debug("Remote #{r[:host]}:#{r[:port]}/#{r[:score]}/#{r[:errors]}e removed from the list")
       end
-      @log.info("#{@remotes.all.count} remote nodes were selected to stay in the list")
+      @log.info("#{@remotes.all.count} best remote nodes were selected to stay in the list")
     end
 
     def terminate
@@ -368,7 +368,7 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
       res = Http.new(uri: "http://#{host}:#{port}/version", network: opts['network']).get
       return true if res.status == 200
       raise "The node #{host}:#{port} is not responding, #{res.status}:#{res.status_line}" unless opts['ignore-ping']
-      @log.error("The node #{host}:#{port} is not responding, #{res.status}:#{res.status_line}")
+      @log.error("The node #{host}:#{port} is not responding but we --ignore-ping, #{res.status}:#{res.status_line}")
       false
     end
   end

data/lib/zold/hungry_wallets.rb

@@ -57,12 +57,13 @@ module Zold
         unless wallet.exists?
           if @queue.size > 256
             @log.error("Hungry queue is full with #{@queue.size} wallets, can't add #{id}")
-          elsif @missed.exists?(id)
-            @log.error("Hungry queue has seen #{id} just #{Age.new(@missed.mtime(id))} ago and it was not-found")
+          elsif @missed.exists?(id.to_s)
+            @log.debug("Hungry queue has seen #{id} just #{Age.new(@missed.mtime(id.to_s))} ago
+(amoung #{@missed.size} others) and it was not found")
           else
             @mutex.synchronize do
               unless @queue.include?(id)
-                @missed.put(id, lifetime: 5 * 60)
+                @missed.put(id.to_s, lifetime: 5 * 60)
                 @queue << id
                 @log.debug("Hungry queue got #{id}, at the pos no.#{@queue.size - 1}")
               end
@@ -85,7 +86,7 @@ module Zold
         Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
           ['pull', id.to_s, "--network=#{@network}", '--tolerate-edges', '--tolerate-quorum=1']
         )
-        @missed.remove(id)
+        @missed.remove(id.to_s)
       rescue Fetch::Error => e
         @log.error("Can't hungry-pull #{id}: #{e.message}")
       end

data/lib/zold/log.rb

@@ -104,5 +104,36 @@ module Zold
     ERRORS.level = Logger::ERROR
     ERRORS.formatter = COMPACT
     ERRORS.freeze
+
+    # Tee logger.
+    class Tee
+      def initialize(first, second)
+        @first = first
+        @second = second
+      end
+
+      def debug(msg)
+        @first.debug(msg)
+        @second.debug(msg)
+      end
+
+      def debug?
+        @first.debug? || @second.debug?
+      end
+
+      def info(msg)
+        @first.info(msg)
+        @second.info(msg)
+      end
+
+      def info?
+        @first.info? || @second.info?
+      end
+
+      def error(msg)
+        @first.error(msg)
+        @second.error(msg)
+      end
+    end
   end
 end

data/lib/zold/node/front.rb

@@ -82,6 +82,7 @@ module Zold
       set :node_alias, nil # to be injected at node.rb
       set :zache, nil # to be injected at node.rb
       set :async_dir, nil # to be injected at node.rb
+      set :journal_dir, nil # to be injected at node.rb
     end
     use Rack::Deflater
 
@@ -136,7 +137,7 @@ while #{settings.address} is in '#{settings.opts['network']}'")
       headers['X-Zold-Thread'] = Thread.current.object_id.to_s
       unless @start.nil?
         if Time.now - @start > 1
-          settings.log.info("Slow response to #{request.request_method} #{request.url} \
+          settings.log.debug("Slow response to #{request.request_method} #{request.url} \
 from #{request.ip} in #{Age.new(@start, limit: 1)}")
         end
         headers['X-Zold-Milliseconds'] = ((Time.now - @start) * 1000).round.to_s
@@ -317,6 +318,43 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
       end
     end
 
+    get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.html} do
+      fetch do |wallet|
+        [
+          '<!DOCTYPE html><html><head>',
+          '<title>' + wallet.id.to_s + '</title>',
+          '<link href="https://cdn.jsdelivr.net/gh/yegor256/tacit@gh-pages/tacit-css-1.4.2.min.css" rel="stylesheet"/>',
+          '<style>table { width: 100%; } td, th { padding: 0.2em .4em }</style>',
+          '</head><body><section>',
+          "<p>#{wallet.network}<br/>",
+          "#{wallet.protocol}<br/>",
+          "#{wallet.id}<br/>",
+          "#{wallet.key.to_pub}</p>",
+          '<table><thead><tr><th>Id</th><th>Date</th><th>Amount</th><th>Wallet</th><th>Details</th></thead>',
+          '<tbody>',
+          wallet.txns.map do |t|
+            [
+              '<tr>',
+              '<td style="color:' + (t.amount.negative? ? 'red' : 'green') + "\">#{t.id}</td>",
+              "<td>#{t.date.utc.iso8601}</td>",
+              '<td style="text-align:right">' + t.amount.to_zld(4) + '</td>',
+              "<td><a href='/wallet/#{t.bnf}.html'>#{t.bnf}</td>",
+              "<td>#{t.details}</td>",
+              '</tr>'
+            ].join
+          end.join,
+          '<p>&mdash;<br/>',
+          "Balance: #{wallet.balance.to_zld(8)} ZLD (#{wallet.balance.to_i} zents)<br/>",
+          "Transactions: #{wallet.txns.count}<br/>",
+          "Taxes: #{Tax.new(wallet).paid} paid, the debt is #{Tax.new(wallet).debt}<br/>",
+          "File size: #{Size.new(wallet.size)}/#{wallet.size}, \
+#{Copies.new(File.join(settings.copies, wallet.id)).all.count} copies<br/>",
+          "Modified: #{wallet.mtime.utc.iso8601} (#{Age.new(wallet.mtime.utc.iso8601)} ago)<br/>",
+          "Digest: #{wallet.digest}</p></section></body></html>"
+        ].join
+      end
+    end
+
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.bin} do
       fetch { |w| send_file(w.path) }
     end
@@ -442,6 +480,25 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
       end.join("\n")
     end
 
+    get '/journal' do
+      content_type('text/html')
+      [
+        '<!DOCTYPE html><html><head>',
+        '<title>/journal</title>',
+        '<link href="https://cdn.jsdelivr.net/gh/yegor256/tacit@gh-pages/tacit-css-1.4.2.min.css" rel="stylesheet"/>',
+        '</head><body><section>',
+        DirItems.new(settings.journal_dir).fetch.sort.map do |f|
+          "<p><a href='/journal/item?id=#{f}'>#{f}</a></p>"
+        end.join,
+        '</section></body></html>'
+      ].join
+    end
+
+    get '/journal/item' do
+      content_type('text/plain')
+      IO.read(File.join(settings.journal_dir, params[:id]))
+    end
+
     not_found do
       status(404)
       content_type('text/plain')

data/lib/zold/node/journaled_entrance.rb

@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018-2019 Zerocracy, Inc.
+#
+# 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 'tempfile'
+require_relative '../log'
+require_relative '../remotes'
+require_relative '../copies'
+require_relative '../tax'
+require_relative '../age'
+require_relative '../commands/clean'
+require_relative '../commands/merge'
+require_relative '../commands/fetch'
+require_relative '../commands/push'
+
+# The entrance with journals.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # The entrance that keeps a journal for each wallet
+  class JournaledEntrance
+    # Decorated wallets
+    class Wallets < SimpleDelegator
+      def initialize(wallets, log)
+        @wallets = wallets
+        @log = log
+        super(wallets)
+      end
+
+      def acq(id, exclusive: false)
+        @wallets.acq(id, exclusive: exclusive) do |wallet|
+          return yield wallet unless exclusive
+          before = wallet.exists? ? IO.read(wallet.path) : ''
+          res = yield wallet
+          after = wallet.exists? ? IO.read(wallet.path) : ''
+          unless before == after
+            diff = Diffy::Diff.new(before, after, context: 0).to_s
+            @log.info("The wallet #{id} was modified:\n  #{diff.gsub("\n", "\n  ")}")
+          end
+          res
+        end
+      end
+    end
+
+    def initialize(entrance, wallets, dir, log, journal)
+      @wallets = JournaledEntrance::Wallets.new(wallets, log)
+      @entrance = entrance
+      @dir = File.expand_path(dir)
+      @log = log
+      @journal = File.join(@dir, journal)
+    end
+
+    def start
+      raise 'Block must be given to start()' unless block_given?
+      FileUtils.mkdir_p(@dir)
+      yield(self)
+    end
+
+    def to_json
+      @entrance.to_json.merge(
+        'dir': @dir
+      )
+    end
+
+    # Returns a list of modifed wallets (as Zold::Id)
+    def push(id, body)
+      DirItems.new(@dir).fetch.each do |f|
+        f = File.join(@dir, f)
+        File.delete(f) if File.mtime(f) < Time.now - 24 * 60 * 60
+      end
+      @log.info("push(#{id}, #{body.length} bytes)")
+      modified = @entrance.push(id, body)
+      IO.write(File.join(@dir, "#{Time.now.utc.iso8601.gsub(/[^0-9]/, '-')}-#{id}"), IO.read(@journal))
+      modified
+    end
+  end
+end

data/lib/zold/patch.rb

@@ -172,7 +172,7 @@ doesn't have this transaction: \"#{txn.to_text}\"")
         end
         temp.refurbish
         if temp.balance.negative? && !temp.id.root? && !allow_negative_balance
-          @log.info("The balance is negative, won't merge: #{wallet.mnemo}")
+          @log.info("The balance is negative, won't merge #{temp.mnemo} on top of #{wallet.mnemo}")
         else
           FileUtils.mkdir_p(File.dirname(file))
           IO.write(file, IO.read(f.path))

data/lib/zold/txn.rb

@@ -128,7 +128,7 @@ module Zold
     end
 
     def to_text
-      start = @amount.negative? ? "##{@id}" : '-'
+      start = @amount.negative? ? "##{@id}" : "(#{@id})"
       "#{start} #{@date.utc.iso8601} #{@amount} #{@bnf} #{@details}"
     end
 

data/lib/zold/version.rb

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

data/test/commands/test_merge.rb

@@ -63,27 +63,6 @@ class TestMerge < Zold::Test
     end
   end
 
-  def test_merges_into_empty_wallet
-    FakeHome.new(log: test_log).run do |home|
-      wallet = home.create_wallet
-      first = home.create_wallet
-      IO.write(first.path, IO.read(wallet.path))
-      second = home.create_wallet
-      IO.write(second.path, IO.read(wallet.path))
-      Zold::Pay.new(wallets: home.wallets, copies: home.dir, 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(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, remotes: home.remotes, copies: copies.root, log: test_log).run(
-        ['merge', wallet.id.to_s]
-      )
-      assert(1, modified.count)
-      assert(wallet.id, modified[0])
-    end
-  end
-
   def test_merges_with_a_broken_copy
     FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet

data/test/node/test_front.rb

@@ -45,7 +45,7 @@ class FrontTest < Zold::Test
   def test_memory_leakage
     skip
     report = MemoryProfiler.report(top: 10) do
-      FakeNode.new(log: test_log).run(['--no-metronome', '--network=foo', '--threads=0']) do |port|
+      FakeNode.new(log: test_log).run(opts('--network=foo')) do |port|
         100.times do
           Zold::Http.new(uri: "http://localhost:#{port}/", network: 'foo').get
         end
@@ -55,7 +55,7 @@ class FrontTest < Zold::Test
   end
 
   def test_renders_front_json
-    FakeNode.new(log: test_log).run(['--no-metronome', '--network=foo', '--threads=0']) do |port|
+    FakeNode.new(log: test_log).run(opts('--network=foo')) do |port|
       res = Zold::Http.new(uri: "http://localhost:#{port}/", network: 'foo').get
       json = JSON.parse(res.body)
       assert_equal(Zold::VERSION, json['version'])
@@ -73,7 +73,7 @@ class FrontTest < Zold::Test
   end
 
   def test_renders_public_pages
-    FakeNode.new(log: test_log).run(['--ignore-score-weakness', '--no-metronome', '--threads=0']) do |port|
+    FakeNode.new(log: test_log).run(opts) do |port|
       {
         200 => [
           '/robots.txt',
@@ -85,6 +85,7 @@ class FrontTest < Zold::Test
           '/ledger',
           '/ledger.json',
           '/metronome',
+          '/journal',
           '/score',
           '/queue',
           '/trace',
@@ -115,7 +116,7 @@ class FrontTest < Zold::Test
   end
 
   def test_updates_list_of_remotes
-    FakeNode.new(log: test_log).run(['--ignore-score-weakness', '--no-metronome', '--no-cache']) do |port|
+    FakeNode.new(log: test_log).run(['--no-metronome', '--ignore-score-weakness', '--no-cache']) do |port|
       (Zold::Remotes::MAX_NODES + 5).times do |i|
         score = Zold::Score.new(
           host: 'localhost', port: i + 1, invoice: 'NOPREFIX@ffffffffffffffff', strength: 1
@@ -136,7 +137,7 @@ class FrontTest < Zold::Test
   end
 
   def test_increments_score
-    FakeNode.new(log: test_log).run(['--threads=1', '--strength=1', '--no-metronome', '--no-cache']) do |port|
+    FakeNode.new(log: test_log).run(opts('--threads=1')) do |port|
       3.times do |i|
         assert_equal_wait(true) do
           response = Zold::Http.new(uri: "http://localhost:#{port}/").get
@@ -150,28 +151,20 @@ class FrontTest < Zold::Test
 
   def test_renders_wallet_pages
     FakeHome.new(log: test_log).run do |home|
-      FakeNode.new(log: test_log).run(['--ignore-score-weakness', '--standalone']) do |port|
+      FakeNode.new(log: test_log).run(opts) do |port|
         wallet = home.create_wallet(txns: 2)
         base = "http://localhost:#{port}"
         response = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").put(wallet.path)
         assert_equal(200, response.status, response.body)
         assert_equal_wait(200) { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.status }
         [
-          "/wallet/#{wallet.id}.txt",
-          "/wallet/#{wallet.id}/balance",
-          "/wallet/#{wallet.id}/key",
-          "/wallet/#{wallet.id}/mtime",
-          "/wallet/#{wallet.id}/digest",
-          "/wallet/#{wallet.id}/size",
-          "/wallet/#{wallet.id}/age",
-          "/wallet/#{wallet.id}/mnemo",
-          "/wallet/#{wallet.id}/debt",
-          "/wallet/#{wallet.id}/txns",
-          "/wallet/#{wallet.id}/txns.json",
-          "/wallet/#{wallet.id}.bin",
-          "/wallet/#{wallet.id}/copies"
+          '.txt', '.html',
+          '/balance', '/key', '/mtime',
+          '/digest', '/size',
+          '/age', '/mnemo', '/debt', '/txns',
+          '/txns.json', '.bin', '/copies'
         ].each do |u|
-          assert_equal_wait(200) { Zold::Http.new(uri: "#{base}#{u}").get.status }
+          assert_equal_wait(200) { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}#{u}").get.status }
         end
       end
     end
@@ -179,7 +172,7 @@ class FrontTest < Zold::Test
 
   def test_renders_wallets_page
     FakeHome.new(log: test_log).run do |home|
-      FakeNode.new(log: test_log).run(['--ignore-score-weakness', '--standalone']) do |port|
+      FakeNode.new(log: test_log).run(opts) do |port|
         wallet = home.create_wallet(txns: 2)
         base = "http://localhost:#{port}"
         response = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").put(wallet.path)
@@ -193,7 +186,7 @@ class FrontTest < Zold::Test
   end
 
   def test_fetch_in_multiple_threads
-    FakeNode.new(log: test_log).run(['--no-metronome', '--threads=0', '--standalone']) do |port|
+    FakeNode.new(log: test_log).run(opts) do |port|
       FakeHome.new(log: test_log).run do |home|
         wallet = home.create_wallet
         base = "http://localhost:#{port}"
@@ -214,7 +207,7 @@ class FrontTest < Zold::Test
   end
 
   def test_pushes_twice
-    FakeNode.new(log: test_log).run(['--no-metronome', '--threads=0', '--standalone']) do |port|
+    FakeNode.new(log: test_log).run(opts) do |port|
       FakeHome.new(log: test_log).run do |home|
         wallet = home.create_wallet
         base = "http://localhost:#{port}"
@@ -232,7 +225,7 @@ class FrontTest < Zold::Test
   end
 
   def test_pushes_many_wallets
-    FakeNode.new(log: test_log).run(['--no-metronome', '--threads=0', '--standalone']) do |port|
+    FakeNode.new(log: test_log).run(opts) do |port|
       base = "http://localhost:#{port}"
       FakeHome.new(log: test_log).run do |home|
         Threads.new(5).assert do
@@ -278,7 +271,7 @@ class FrontTest < Zold::Test
   end
 
   def test_gzip
-    FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
+    FakeNode.new(log: test_log).run(opts) do |port|
       response = Zold::Http.new(uri: URI("http://localhost:#{port}/version")).get
       assert_equal(200, response.status, response)
       assert_operator(300, :>, response.body.length.to_i, 'Expected the content to be small')
@@ -287,7 +280,7 @@ class FrontTest < Zold::Test
 
   def test_performance
     times = Queue.new
-    FakeNode.new(log: test_log).run(['--threads=4', '--strength=6', '--no-metronome']) do |port|
+    FakeNode.new(log: test_log).run(opts('--threads=4', '--strength=6')) do |port|
       Threads.new(10).assert(100) do
         start = Time.now
         Zold::Http.new(uri: URI("http://localhost:#{port}/")).get
@@ -304,7 +297,7 @@ class FrontTest < Zold::Test
   # HTTP request. This value is enough to identify a valueable node, and filter
   # out those that are too weak.
   def test_score_is_reduced
-    FakeNode.new(log: test_log).run(['--threads=1', '--strength=1', '--no-metronome', '--farmer=plain']) do |port|
+    FakeNode.new(log: test_log).run(opts('--threads=1', '--strength=1', '--farmer=plain')) do |port|
       scores = []
       50.times do
         res = Zold::Http.new(uri: URI("http://localhost:#{port}/")).get
@@ -316,7 +309,7 @@ class FrontTest < Zold::Test
   end
 
   def test_headers_are_being_set_correctly
-    FakeNode.new(log: test_log).run(['--expose-version=9.9.9', '--no-metronome', '--threads=0']) do |port|
+    FakeNode.new(log: test_log).run(opts('--expose-version=9.9.9')) do |port|
       response = Zold::Http.new(uri: URI("http://localhost:#{port}/")).get
       assert_equal('no-cache', response.headers['Cache-Control'])
       assert_equal('close', response.headers['Connection'])
@@ -330,7 +323,7 @@ class FrontTest < Zold::Test
 
   def test_alias_parameter
     name = SecureRandom.hex(4)
-    FakeNode.new(log: test_log).run(['--ignore-score-weakness', "--alias=#{name}"]) do |port|
+    FakeNode.new(log: test_log).run(opts("--alias=#{name}")) do |port|
       uri = URI("http://localhost:#{port}/")
       response = Zold::Http.new(uri: uri).get
       assert_match(
@@ -342,7 +335,7 @@ class FrontTest < Zold::Test
   end
 
   def test_default_alias_parameter
-    FakeNode.new(log: test_log).run(['--ignore-score-weakness', '--no-metronome']) do |port|
+    FakeNode.new(log: test_log).run(opts) do |port|
       uri = URI("http://localhost:#{port}/")
       response = Zold::Http.new(uri: uri).get
       assert_match(
@@ -355,7 +348,7 @@ class FrontTest < Zold::Test
 
   def test_invalid_alias
     exception = assert_raises RuntimeError do
-      FakeNode.new(log: test_log).run(['--ignore-score-weakness', '--alias=invalid-alias']) do |port|
+      FakeNode.new(log: test_log).run(opts('--alias=invalid-alias')) do |port|
         uri = URI("http://localhost:#{port}/")
         Zold::Http.new(uri: uri).get
       end
@@ -365,7 +358,7 @@ class FrontTest < Zold::Test
 
   def test_push_fetch_in_multiple_threads
     key = Zold::Key.new(text: IO.read('fixtures/id_rsa'))
-    FakeNode.new(log: test_log).run(['--no-metronome', '--threads=0', '--standalone']) do |port|
+    FakeNode.new(log: test_log).run(opts) do |port|
       FakeHome.new(log: test_log).run do |home|
         wallet = home.create_wallet(Zold::Id::ROOT)
         base = "http://localhost:#{port}"
@@ -383,4 +376,10 @@ class FrontTest < Zold::Test
       end
     end
   end
+
+  private
+
+  def opts(*extra)
+    ['--no-metronome', '--ignore-score-weakness', '--standalone', '--threads=0', '--strength=1'] + extra
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.26.15
+  version: 0.26.16
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -671,6 +671,7 @@ files:
 - lib/zold/node/farm.rb
 - lib/zold/node/farmers.rb
 - lib/zold/node/front.rb
+- lib/zold/node/journaled_entrance.rb
 - lib/zold/node/nodup_entrance.rb
 - lib/zold/node/nospam_entrance.rb
 - lib/zold/node/safe_entrance.rb
@@ -779,7 +780,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.26.15!
+  Thanks for installing Zold 0.26.16!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try ZLD online wallet at: https://wts.zold.io