zold 0.17.6 → 0.17.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7a2934cd243231fd712085b3f87a94d6bb4bf614cc1f5a1e9cada9f7268939d
-  data.tar.gz: f92eb91031505dee84d3bdbbc072e3d7384494e4954a5420b7656b8089d425e7
+  metadata.gz: 1fe6c89e0f94aab5d15fc27cbd8cd8b25ae870341eb056e442a568430c97b1fa
+  data.tar.gz: 55b3c18e4f6c223c521265b4ae1c7cb9c46b5e915df6dbe47f3c176ec0ad00d0
 SHA512:
-  metadata.gz: 7d974ce11c5bf502b56ce917c19ac1d388d3a28399ddcf84e0fc3860dd2935576965451f26750bcf52744c9b33f411a7e885d6c84cdcdcfbecc1699e008d7e5f
-  data.tar.gz: 7bb56302734385c3a20a824b0c9d312ed5d88b02adca2c6c0d9c68554e91d598f26ed29f2019e0435d4622308c5b0e889cade6737773ace52c62701b4fc2570c
+  metadata.gz: 66998849bf25873d1814fee29109744bffddc9c19f39c179388a605b55f6414ec6bb9df72455c3e83439c85475268d752731cf74f574c5aab6e1fdf3505d0aa3
+  data.tar.gz: ecd1a71750d26762749ab24c931307713f7b8586ba09d865e324b209d441d3740ddb65df97c59d3409b19b88e22c6a8698881ccbe7d203c2ac9e91563f262edb

data/lib/zold/commands/node.rb

@@ -159,9 +159,9 @@ module Zold
           default: false
         o.string '--alias',
           'The alias of the node (default: host:port)'
-        o.boolean '--no-spawn',
-          'Don\'t use child processes for the score farm',
-          default: false
+        o.string '--farmer',
+          'The name of the farmer, e.g. "plain", "spawn", "fork" (default: "plain")',
+          default: 'plain'
         o.bool '--help', 'Print instructions'
       end
       if opts.help?
@@ -276,11 +276,19 @@ module Zold
     private
 
     def farmer(opts)
-      if opts['no-spawn']
-        @log.debug('Plain farmer is used, only one CPU will be utilized')
-        return Farmers::Plain.new
+      case opts['farmer'].downcase.strip
+      when 'plain'
+        @log.debug('"Plain" farmer is used, only one CPU will be utilized')
+        Farmers::Plain.new
+      when 'fork'
+        @log.debug('"Fork" farmer is used')
+        Farmers::Fork.new(log: @log)
+      when 'spawn'
+        @log.debug('"Spawn" farmer is used')
+        Farmers::Spawn.new(log: @log)
+      else
+        raise "Farmer name is not recognized: #{opts['farmer']}"
       end
-      Farmers::Fork.new(log: @log)
     end
 
     # Returns exit code

data/lib/zold/node/farmers.rb

@@ -77,5 +77,64 @@ for #{after.host}:#{after.port} in #{Age.new(start)}: #{after.suffixes}")
         after
       end
     end
+
+    # In a child process
+    class Spawn
+      def initialize(log: Log::NULL)
+        @log = log
+      end
+
+      def up(score)
+        start = Time.now
+        bin = File.expand_path(File.join(File.dirname(__FILE__), '../../../bin/zold'))
+        raise "Zold binary not found at #{bin}" unless File.exist?(bin)
+        cmd = [
+          'ruby',
+          Shellwords.escape(bin),
+          '--skip-upgrades',
+          "--info-tid=#{Thread.current.thread_variable_get(:tid)}",
+          "--info-thread=#{Shellwords.escape(Thread.current.name)}",
+          "--info-start=#{Time.now.utc.iso8601}",
+          '--low-priority',
+          'next',
+          Shellwords.escape(score)
+        ].join(' ')
+        Open3.popen2e(cmd) do |stdin, stdout, thr|
+          Thread.current.thread_variable_set(:pid, thr.pid.to_s)
+          at_exit { Farmers.kill(@log, thr.pid, start) }
+          @log.debug("Scoring started in proc ##{thr.pid} \
+for #{score.value}/#{score.strength} at #{score.host}:#{score.port}")
+          begin
+            stdin.close
+            buffer = +''
+            loop do
+              begin
+                buffer << stdout.read_nonblock(16 * 1024)
+                # rubocop:disable Lint/HandleExceptions
+              rescue IO::WaitReadable => _
+                # rubocop:enable Lint/HandleExceptions
+                # nothing to do here
+              rescue StandardError => e
+                @log.error(buffer)
+                raise e
+              end
+              break if buffer.end_with?("\n") && thr.value.to_i.zero?
+              if stdout.closed?
+                raise "Failed to calculate the score (##{thr.value}): #{buffer}" unless thr.value.to_i.zero?
+                break
+              end
+              sleep(1)
+              Thread.current.thread_variable_set(:buffer, buffer.length.to_s)
+            end
+            after = Score.parse(buffer.strip)
+            @log.debug("Next score #{after.value}/#{after.strength} found in proc ##{thr.pid} \
+for #{after.host}:#{after.port} in #{Age.new(start)}: #{after.suffixes}")
+            after
+          ensure
+            Farmers.kill(@log, thr.pid, start)
+          end
+        end
+      end
+    end
   end
 end

data/lib/zold/remotes.rb

@@ -104,21 +104,21 @@ module Zold
 
       def assert_valid_score(score)
         raise "Invalid score #{score}" unless score.valid?
-        raise "Expired score (#{Age.new(score.time)}) #{score.reduce(4)}" if score.expired?
+        raise "Expired score (#{Age.new(score.time)}) #{score.reduced(4)}" if score.expired?
       end
 
       def assert_score_ownership(score)
-        raise "Masqueraded host #{@host} as #{score.host}: #{score.reduce(4)}" if @host != score.host
-        raise "Masqueraded port #{@port} as #{score.port}: #{score.reduce(4)}" if @port != score.port
+        raise "Masqueraded host #{@host} as #{score.host}: #{score.reduced(4)}" if @host != score.host
+        raise "Masqueraded port #{@port} as #{score.port}: #{score.reduced(4)}" if @port != score.port
       end
 
       def assert_score_strength(score)
         return if score.strength >= Score::STRENGTH
-        raise "Score #{score.strength} is too weak (<#{Score::STRENGTH}): #{score.reduce(4)}"
+        raise "Score #{score.strength} is too weak (<#{Score::STRENGTH}): #{score.reduced(4)}"
       end
 
       def assert_score_value(score, min)
-        raise "Score #{score.value} is too small (<#{min}): #{score.reduce(4)}" if score.value < min
+        raise "Score #{score.value} is too small (<#{min}): #{score.reduced(4)}" if score.value < min
       end
     end
 

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.17.6'
+  VERSION = '0.17.7'
   PROTOCOL = 2
 end

data/test/node/test_farmers.rb

@@ -28,9 +28,16 @@ require_relative '../../lib/zold/node/farmers'
 require_relative '../../lib/zold/verbose_thread'
 
 class FarmersTest < Zold::Test
+  # Types to test
+  TYPES = [
+    Zold::Farmers::Plain,
+    Zold::Farmers::Spawn,
+    Zold::Farmers::Fork
+  ].freeze
+
   def test_calculates_next_score
     before = Zold::Score.new(host: 'some-host', port: 9999, invoice: 'NOPREFIX4@ffffffffffffffff', strength: 3)
-    [Zold::Farmers::Plain, Zold::Farmers::Fork].each do |farmer_class|
+    TYPES.each do |farmer_class|
       farmer = farmer_class.new(log: test_log)
       after = farmer.up(before)
       assert_equal(1, after.value)
@@ -41,7 +48,7 @@ class FarmersTest < Zold::Test
   end
 
   def test_calculates_large_score
-    [Zold::Farmers::Plain, Zold::Farmers::Fork].each do |type|
+    TYPES.each do |type|
       log = TestLogger.new(test_log)
       thread = Thread.start do
         farmer = type.new(log: log)
@@ -54,7 +61,7 @@ class FarmersTest < Zold::Test
   end
 
   def test_kills_farmer
-    [Zold::Farmers::Plain, Zold::Farmers::Fork].each do |type|
+    TYPES.each do |type|
       farmer = type.new(log: test_log)
       thread = Thread.start do
         Zold::VerboseThread.new(test_log).run do

data/test/node/test_front.rb

@@ -283,7 +283,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', '--no-spawn']) do |port|
+    FakeNode.new(log: test_log).run(['--threads=1', '--strength=1', '--no-metronome', '--farmer=plain']) do |port|
       res = Zold::Http.new(uri: URI("http://localhost:#{port}/")).get
       assert_wait { Zold::Score.parse(res.headers[Zold::Http::SCORE_HEADER]).value > Zold::Front::MIN_SCORE - 1 }
       sleep(1)

data/zold.gemspec

@@ -65,7 +65,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'concurrent-ruby', '1.1.3'
   s.add_runtime_dependency 'cucumber', '3.1.2' # has to stay here for Heroku
   s.add_runtime_dependency 'diffy', '3.2.1'
-  s.add_runtime_dependency 'futex', '0.6.1'
+  s.add_runtime_dependency 'futex', '0.6.2'
   s.add_runtime_dependency 'get_process_mem', '0.2.3'
   s.add_runtime_dependency 'json', '2.1.0'
   s.add_runtime_dependency 'memory_profiler', '0.9.12'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.17.6
+  version: 0.17.7
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: get_process_mem
   requirement: !ruby/object:Gem::Requirement
@@ -700,7 +700,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.17.6!
+  Thanks for installing Zold 0.17.7!
     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