zold 0.14.18 → 0.14.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ecca17ec572da83d30874c74ad40b383e22855e
-  data.tar.gz: 501cc2ef09710e3bd6d578d3f8cae99895ae25e8
+  metadata.gz: c3cb68abdacd80f8b216e8d10a1294daf4fab097
+  data.tar.gz: 6aa61f6f6a664b45b423880116ca5c6a462bfe26
 SHA512:
-  metadata.gz: 584cfab45f2f97b6d5bccaee7e285d1637ca546357bb9b08e7a7e30f85789a31ca69e59ec96e72177b6c64568284e0ab982248bc25c0ada8a13ad86580c9496b
-  data.tar.gz: '09553f0034eee231dbba5c6d1eccd3c2d4e8e120bb70505f741d1b20f21cd7d103baeca54259c0e5bfad66b97e4b64b62ea3fb536b5eef411b9344faf83fbbfa'
+  metadata.gz: ca68efb7ea0bd921feace2646bd5e032f785565b120eac070a7aa35af700fcabaf21a5af7dfd3607a6edd2d6e26e118397823b0ef198eb2a4efb90d203c99543
+  data.tar.gz: 94773aa9d97a09ac728f3d893c8009deafccdc3bfcc8d2bf349574b2a1d841b916f8a576e5e542b0fc2a92b574d3ba4bed4d1d1052056ca83029d46e71fa1ce9

data/lib/zold/commands/node.rb

@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'open3'
 require 'slop'
 require_relative '../version'
 require_relative '../score'
@@ -118,6 +119,10 @@ module Zold
           'Maximum amount of nohup re-starts (-1 by default, which means forever)',
           require: true,
           default: -1
+        o.bool '--no-metronome',
+          'Don\'t run the metronome',
+          required: true,
+          default: false
         o.bool '--help', 'Print instructions'
       end
       if opts.help?
@@ -274,6 +279,7 @@ module Zold
 
     def metronome(farm, opts)
       metronome = Metronome.new(@log)
+      return metronome if opts['no-metronome']
       require_relative 'routines/spread'
       metronome.add(Routines::Spread.new(opts, @wallets, @remotes, log: @log))
       unless opts['standalone']

data/lib/zold/commands/taxes.rb

@@ -99,7 +99,7 @@ Available options:"
 
     private
 
-    def pay(wallet, _)
+    def pay(wallet, opts)
       raise 'The wallet is absent' unless wallet.exists?
       tax = Tax.new(wallet)
       debt = tax.debt

data/lib/zold/node/farm.rb

@@ -21,9 +21,11 @@
 # SOFTWARE.
 
 require 'time'
+require 'open3'
 require_relative '../log'
 require_relative '../score'
 require_relative '../verbose_thread'
+require_relative '../backtrace'
 require_relative '../atomic_file'
 
 # The farm of scores.
@@ -82,14 +84,15 @@ module Zold
             VerboseThread.new(@log).run do
               cycle(host, port, strength, threads)
             end
+            break unless @alive
           end
         end
       end
-      alive = true
+      @alive = true
       @cleanup = Thread.new do
         Thread.current.abort_on_exception = true
         Thread.current.name = 'cleanup'
-        while alive
+        while @alive
           sleep(60) unless strength == 1 # which will only happen in tests
           VerboseThread.new(@log).run do
             cleanup(host, port, strength, threads)
@@ -103,7 +106,7 @@ module Zold
       ensure
         @log.info("Terminating the farm with #{@threads.count} threads...")
         start = Time.now
-        alive = false
+        @alive = false
         if strength == 1
           @cleanup.join
           @log.info("Cleanup thread finished in #{(Time.now - start).round(2)}s")
@@ -113,8 +116,8 @@ module Zold
         end
         @threads.each do |t|
           tstart = Time.now
-          t.exit
-          @log.info("Thread #{t.name} terminated in #{(Time.now - tstart).round(2)}s")
+          t.join(0.1)
+          @log.info("Thread #{t.name} finished in #{(Time.now - tstart).round(2)}s")
         end
         @log.info("Farm stopped in #{(Time.now - start).round(2)}s")
       end
@@ -144,11 +147,42 @@ module Zold
       return unless s.port == port
       return unless s.strength >= strength
       Thread.current.name = s.to_mnemo
-      save(threads, [s.next])
-      # score = Score.parse(`ruby #{File.join(File.dirname(__FILE__), '../../../bin/zold')} next "#{s}"`)
-      # @log.debug("New score discovered: #{score}")
-      # save(threads, [score])
-      cleanup(host, port, strength, threads)
+      cmd = "ruby #{File.join(File.dirname(__FILE__), '../../../bin/zold')} next \"#{s}\""
+      Open3.popen2e(cmd) do |stdin, stdout, thr|
+        @log.debug("Score counting started in process ##{thr.pid}")
+        begin
+          stdin.close
+          buffer = +''
+          loop do
+            begin
+              buffer << stdout.read_nonblock(1024)
+            rescue IO::WaitReadable => e
+              @log.debug("Still waiting for data from the score provider: #{e.message}")
+            end
+            if buffer.end_with?("\n")
+              score = Score.parse(buffer.strip)
+              @log.debug("New score discovered: #{score}")
+              save(threads, [score])
+              cleanup(host, port, strength, threads)
+              break
+            end
+            break if stdout.eof?
+            break unless @alive
+            sleep 0.1
+          end
+        rescue StandardError => e
+          @log.error(Backtrace.new(e).to_s)
+        ensure
+          kill(thr.pid)
+        end
+      end
+    end
+
+    def kill(pid)
+      Process.kill('TERM', pid)
+      @log.debug("Process ##{pid} killed")
+    rescue StandardError => e
+      @log.debug("No need to kill process ##{pid} since it's dead already: #{e.message}")
     end
 
     def save(threads, list = [])

data/lib/zold/remotes.rb

@@ -26,6 +26,7 @@ require 'uri'
 require 'time'
 require 'fileutils'
 require_relative 'backtrace'
+require_relative 'score'
 require_relative 'node/farm'
 require_relative 'atomic_file'
 require_relative 'type'
@@ -61,7 +62,7 @@ module Zold
     class Remote < Dry::Struct
       attribute :host, Types::Strict::String
       attribute :port, Types::Strict::Integer.constrained(gteq: 0, lt: 65_535)
-      attribute :score, Score
+      attribute :score, Object
       attribute :idx, Types::Strict::Integer
       attribute :network, Types::Strict::String.optional.default('test')
       attribute :log, (Types::Class.constructor do |value|

data/lib/zold/version.rb

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

data/test/node/test_farm.rb

@@ -39,7 +39,7 @@ class FarmTest < Minitest::Test
 
   def test_renders_in_json
     Dir.mktmpdir do |dir|
-      farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
+      farm = Zold::Farm.new('NOPREFIX6@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
       farm.start('localhost', 80, threads: 4, strength: 2) do
         sleep 0.1 while farm.best.empty? || farm.best[0].value.zero?
         count = 0
@@ -51,7 +51,7 @@ class FarmTest < Minitest::Test
 
   def test_renders_in_text
     Dir.mktmpdir do |dir|
-      farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
+      farm = Zold::Farm.new('NOPREFIX7@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
       farm.start('localhost', 80, threads: 2, strength: 1) do
         assert(!farm.to_text.nil?)
       end
@@ -60,7 +60,7 @@ class FarmTest < Minitest::Test
 
   def test_makes_best_score_in_background
     Dir.mktmpdir do |dir|
-      farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
+      farm = Zold::Farm.new('NOPREFIX1@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
       farm.start('localhost', 80, threads: 4, strength: 3) do
         sleep 0.1 while farm.best.empty? || farm.best[0].value < 3
         score = farm.best[0]
@@ -72,7 +72,7 @@ class FarmTest < Minitest::Test
 
   def test_correct_score_from_empty_farm
     Dir.mktmpdir do |dir|
-      farm = Zold::Farm.new('NOPREFIX@cccccccccccccccc', File.join(dir, 'f'), log: test_log)
+      farm = Zold::Farm.new('NOPREFIX2@cccccccccccccccc', File.join(dir, 'f'), log: test_log)
       farm.start('example.com', 8080, threads: 0, strength: 1) do
         score = farm.best[0]
         assert(!score.expired?)
@@ -86,7 +86,7 @@ class FarmTest < Minitest::Test
   def test_pre_loads_history
     Dir.mktmpdir do |dir|
       cache = File.join(dir, 'cache')
-      farm = Zold::Farm.new('NOPREFIX@cccccccccccccccc', cache, log: test_log)
+      farm = Zold::Farm.new('NOPREFIX3@cccccccccccccccc', cache, log: test_log)
       farm.start('example.com', 8080, threads: 0, strength: 1) do
         score = farm.best[0]
         assert_equal(0, score.value)
@@ -102,11 +102,12 @@ class FarmTest < Minitest::Test
       cache = File.join(dir, 'cache')
       score = Zold::Score.new(
         time: Time.parse('2017-07-19T21:24:51Z'),
-        host: 'some-host', port: 9999, invoice: 'NOPREFIX@ffffffffffffffff', suffixes: %w[13f7f01 b2b32b 4ade7e],
+        host: 'some-host', port: 9999, invoice: 'NOPREFIX4@ffffffffffffffff',
+        suffixes: %w[13f7f01 b2b32b 4ade7e],
         strength: 6
       )
       File.write(cache, score.to_s)
-      farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', cache, log: test_log)
+      farm = Zold::Farm.new('NOPREFIX4@ffffffffffffffff', cache, log: test_log)
       farm.start(score.host, score.port, threads: 1, strength: score.strength) do
         100.times do
           sleep(0.1)
@@ -129,14 +130,14 @@ class FarmTest < Minitest::Test
       ].each do |score_garbage_line|
         valid_score = Zold::Score.new(
           time: Time.parse('2017-07-19T21:24:51Z'),
-          host: 'some-host', port: 9999, invoice: 'NOPREFIX@ffffffffffffffff',
+          host: 'some-host', port: 9999, invoice: 'NOPREFIX5@ffffffffffffffff',
           suffixes: %w[13f7f01 b2b32b 4ade7e], strength: 6
         )
         File.open(file, 'w') do |f|
           f.puts(score_garbage_line)
           f.puts(valid_score)
         end
-        farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', file, log: log)
+        farm = Zold::Farm.new('NOPREFIX5@ffffffffffffffff', file, log: log)
         assert_equal(1, farm.best.count)
         assert(log.msg.include?('Invalid score'))
       end

data/test/node/test_front.rb

@@ -166,4 +166,16 @@ class FrontTest < Minitest::Test
       )
     end
   end
+
+  def test_performance
+    start = Time.now
+    total = 50
+    FakeNode.new(log: test_log).run(['--threads=4', '--strength=6', '--no-metronome']) do |port|
+      total.times do
+        Zold::Http.new(uri: URI("http://localhost:#{port}/"), score: nil).get
+      end
+    end
+    sec = (Time.now - start) / total
+    test_log.info("Average response time is #{sec.round(2)}s")
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.18
+  version: 0.14.19
 platform: ruby
 authors:
 - Yegor Bugayenko