zold 0.10.10 → 0.10.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1a0df814aaa040edb72486cce4b9512ef380baa
-  data.tar.gz: c1596a6c12527583ed59d1fa9ec864afb1beb5de
+  metadata.gz: 1e2236b7567d7ba2d5c403278d42ec9e9385ab36
+  data.tar.gz: a379df9335dcd1d79266e1393f2a38f8c4e93f95
 SHA512:
-  metadata.gz: 0fb149dbfbecb7ee537148ced5272b364ca54ecde594261893c9a54018d7e5c4e44895bd88e41f9b0c244d6162c0f6d6c01c04f8c30059f7cd3094bfd5997c42
-  data.tar.gz: 4195273f638acafef7f21bed1c9e4b35da9d9556c97686ffb66ecc93ef9dcf4bccedd2fbaa6e0d651186b1981c9972414a3953b265116b036bde8f121a43c8ee
+  metadata.gz: 94ed101de88e700fcfd8bd785d73b8c999dacc4e0d802ead0309e318f59f315754245b5ef23779e8ccb6f46bc660ef52e014f4365062310f544310713aaf6e1a
+  data.tar.gz: edf18e39339f221a86d7d7a368ba45190fa8dab3dda99be33e2bd36e340a149466531f3387ded9b09f04d02e43ee0095e31afa8d9348b9d37707a6478fc3d84e

data/lib/zold/commands/node.rb

@@ -22,6 +22,7 @@ require 'slop'
 require_relative '../score'
 require_relative '../wallets'
 require_relative '../remotes'
+require_relative '../verbose_thread'
 require_relative '../node/entrance'
 require_relative '../node/front'
 require_relative '../node/farm'
@@ -71,34 +72,34 @@ module Zold
         return
       end
       raise '--invoice is mandatory' unless opts[:invoice]
-      Zold::Front.set(:log, @log)
-      Zold::Front.set(:logging, @log.debug?)
+      Front.set(:log, @log)
+      Front.set(:logging, @log.debug?)
       FileUtils.mkdir_p(opts[:home])
-      Zold::Front.set(:home, opts[:home])
-      Zold::Front.set(
+      Front.set(:home, opts[:home])
+      Front.set(
         :server_settings,
         Logger: WebrickLog.new(@log),
         AccessLog: []
       )
       if opts['standalone']
         remotes = Remotes::Empty.new
-        @log.debug('Running in standalone mode!')
+        @log.debug('Running in standalone mode! (will never talk to other remotes)')
       else
         remotes = Remotes.new(File.join(opts[:home], 'zold-remotes'))
       end
       wallets = Wallets.new(File.join(opts[:home], 'zold-wallets'))
-      Zold::Front.set(:wallets, wallets)
-      Zold::Front.set(:remotes, remotes)
+      Front.set(:wallets, wallets)
+      Front.set(:remotes, remotes)
       copies = File.join(opts[:home], 'zold-copies')
-      Zold::Front.set(:copies, copies)
+      Front.set(:copies, copies)
       address = "#{opts[:host]}:#{opts[:port]}".downcase
-      Zold::Front.set(:address, address)
-      Zold::Front.set(
+      Front.set(:address, address)
+      Front.set(
         :entrance, Entrance.new(wallets, remotes, copies, address, log: @log)
       )
-      Zold::Front.set(:root, Dir.pwd)
-      Zold::Front.set(:port, opts['bind-port'])
-      Zold::Front.set(:reboot, !opts['never-reboot'])
+      Front.set(:root, Dir.pwd)
+      Front.set(:port, opts['bind-port'])
+      Front.set(:reboot, !opts['never-reboot'])
       invoice = opts[:invoice]
       unless invoice.include?('@')
         require_relative 'pull'
@@ -112,17 +113,19 @@ module Zold
         opts[:port],
         threads: opts[:threads], strength: opts[:strength]
       )
-      Zold::Front.set(:farm, farm)
+      Front.set(:farm, farm)
       update = Thread.start do
-        loop do
-          sleep(60)
-          Zold::Remote.new(remotes: remotes, log: @log).run(%w[remote update --reboot])
-          @log.debug('Regular update of remote nodes succeeded')
+        VerboseThread.new(@log).run do
+          loop do
+            sleep(60)
+            Remote.new(remotes: remotes, log: @log).run(%w[remote update --reboot])
+            @log.debug('Regular update of remote nodes succeeded')
+          end
         end
       end
       @log.debug('Starting up the web front...')
       begin
-        Zold::Front.run!
+        Front.run!
       ensure
         farm.stop
         update.exit

data/lib/zold/node/farm.rb

@@ -21,6 +21,7 @@
 require 'time'
 require_relative '../log'
 require_relative '../score'
+require_relative '../verbose_thread'
 
 # The farm of scores.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -63,24 +64,26 @@ module Zold
       @scores << first
       @threads = (1..threads).map do |t|
         Thread.new do
-          Thread.current.name = "farm-#{t}"
-          loop do
-            s = @scores.pop
-            next unless s.valid?
-            @semaphore.synchronize do
-              before = @best.map(&:value).max
-              @best << s
-              after = @best.map(&:value).max
-              @best.reject! { |b| b.value < after }
-              @log.debug("#{Thread.current.name}: best is #{@best[0]}") if before != after
+          VerboseThread.new(@log).run do
+            Thread.current.name = "farm-#{t}"
+            loop do
+              s = @scores.pop
+              next unless s.valid?
+              @semaphore.synchronize do
+                before = @best.map(&:value).max
+                @best << s
+                after = @best.map(&:value).max
+                @best.reject! { |b| b.value < after }
+                @log.debug("#{Thread.current.name}: best is #{@best[0]}") if before != after
+              end
+              if @scores.length < 4
+                @scores << Score.new(
+                  Time.now, host, port, @invoice,
+                  strength: strength
+                )
+              end
+              @scores << s.next
             end
-            if @scores.length < 4
-              @scores << Score.new(
-                Time.now, host, port, @invoice,
-                strength: strength
-              )
-            end
-            @scores << s.next
           end
         end
       end

data/lib/zold/verbose_thread.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.
+
+require_relative 'log'
+
+# Verbose thread.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Verbose thread
+  class VerboseThread
+    def initialize(log = Log::Quiet.new)
+      @log = log
+    end
+
+    def run
+      yield
+    rescue StandardError => e
+      @log.error("#{e.class.name}: #{e.message} #{e.backtrace.join("\n\t")}")
+      raise e
+    end
+  end
+end

data/lib/zold/version.rb

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

data/test/node/fake_node.rb

@@ -22,6 +22,7 @@ require 'tmpdir'
 require 'webmock/minitest'
 require_relative '../../lib/zold/log'
 require_relative '../../lib/zold/http'
+require_relative '../../lib/zold/verbose_thread'
 
 # Fake node.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -39,7 +40,7 @@ class FakeNode
       port = server.addr[1]
       server.close
       node = Thread.new do
-        begin
+        Zold::VerboseThread.new(@log).run do
           Thread.current.abort_on_exception = true
           home = File.join(dir, 'node-home')
           require_relative '../../lib/zold/commands/node'
@@ -54,8 +55,6 @@ class FakeNode
               '--home', home
             ]
           )
-        rescue StandardError => e
-          @log.error(e.message + "\n" + e.backtrace.join("\n\t"))
         end
       end
       home = URI("http://localhost:#{port}/")

data/test/node/test_farm.rb

@@ -28,7 +28,7 @@ class FarmTest < Minitest::Test
   def test_makes_best_score_in_background
     farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff')
     farm.start('localhost', 80, threads: 4, strength: 2)
-    sleep 1 while farm.best.empty? || farm.best[0].value.zero?
+    sleep 0.1 while farm.best.empty? || farm.best[0].value.zero?
     assert(farm.best[0].value > 0)
     farm.stop
   end

data/test/test_tax.rb

@@ -47,7 +47,7 @@ class TestTax < Minitest::Test
         )
       )
       tax = Zold::Tax.new(wallet)
-      assert(tax.debt > Zold::Amount.new(coins: 1_006_524_000))
+      assert(tax.debt > Zold::Amount.new(coins: 1_006_523_000))
       assert(tax.debt < Zold::Amount.new(coins: 1_006_524_999))
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.10.10
+  version: 0.10.11
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -327,6 +327,7 @@ files:
 - lib/zold/signature.rb
 - lib/zold/tax.rb
 - lib/zold/txn.rb
+- lib/zold/verbose_thread.rb
 - lib/zold/version.rb
 - lib/zold/wallet.rb
 - lib/zold/wallets.rb