zold 0.13.21 → 0.13.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b54e147de6f13a87996515785862a09da82b1a5
-  data.tar.gz: 332d33f707a6ad855001b9d77738d2f497622ef7
+  metadata.gz: e2e4d4e5e627137b421211b093b25dd2930423d7
+  data.tar.gz: e78835ebe8c5ead373287def6500d3d17a9ab648
 SHA512:
-  metadata.gz: 6696d078025e97891007c9295fd2210de314c4dbbcef5e968fc4d7a9dd5b614c81903a4066ee4016074c7974321c1e3d656825f01d934ae0dcc55869aa693041
-  data.tar.gz: 4463d7a107bbb6acb7a89931ae745dcc05598005cccaca4caf56c2484b5376f3ee07b595fca407376432bf4fcf7461408ff6f88aae52718165e784bf24faaff0
+  metadata.gz: e0d902fe84aa485c17b9785d83a832ca212c001db35bedd520026d1f4bc41e162006b3aecc3459192a9d5d24e6bfdbcd7a157edb871695b34fe663c816f35f6c
+  data.tar.gz: 176e92ee884fb86e0ef764bf05478cebb940183b07082f6f8ade8cec1162648cdcc319ace98fdd6776e9f2506afa9f2794163e483a0493445a252f97d9b619e2

data/lib/zold/commands/node.rb

@@ -155,7 +155,7 @@ module Zold
         invoice = Invoice.new(wallets: @wallets, log: @log).run(['invoice', invoice])
       end
       farm = Farm.new(invoice, File.join(Dir.pwd, 'farm'), log: @log)
-      farm.start(opts[:host], opts[:port], threads: opts[:threads], strength: opts[:strength]) do
+      farm.start(host, opts[:port], threads: opts[:threads], strength: opts[:strength]) do
         Front.set(:farm, farm)
         metronome = metronome(farm, entrance, opts)
         begin

data/lib/zold/node/farm.rb

@@ -63,7 +63,7 @@ module Zold
     def to_json
       {
         threads: @threads.map do |t|
-          "#{t.name}/#{t.status}/{t.alive? ? 'A' : 'D'}"
+          "#{t.name}/#{t.status}/#{t.alive? ? 'A' : 'D'}"
         end.join(', '),
         scores: @scores.size,
         best: @best.map(&:value).join(', '),
@@ -74,9 +74,8 @@ module Zold
     def start(host, port, strength: 8, threads: 8)
       @log.debug('Zero-threads farm won\'t score anything!') if threads.zero?
       @scores = Queue.new
-      h = history(threads)
-      h.each { |s| @scores << s }
-      @best << (h[0] || Score.new(Time.now, host, port, @invoice, strength: strength))
+      @best = history
+      clean(host, port, strength, threads)
       @log.info("#{@scores.size} scores pre-loaded, the best is: #{@best[0]}")
       @threads = (1..threads).map do |t|
         Thread.new do
@@ -121,21 +120,19 @@ module Zold
 
     def clean(host, port, strength, threads)
       @mutex.synchronize do
-        before = @best.map(&:value).max
-        @best = @best.reject(&:expired?).sort_by(&:value).reverse
+        before = @best.map(&:value).max.to_i
+        @best = @best.select(&:valid?).reject(&:expired?).sort_by(&:value).reverse
         @best = @best.take(threads) unless threads.zero?
-        if @scores.length < threads || @best.count < threads
-          zero = Score.new(Time.now, host, port, @invoice, strength: strength)
-          @scores << zero
-          @best << zero
+        if @best.empty? || !threads.zero? && @best.map(&:age_hours).min > 24 / threads
+          @best << Score.new(Time.now, host, port, @invoice, strength: strength)
         end
+        @best.sort_by(&:age_hours).each { |b| @scores << b }
         after = @best.map(&:value).max
         @log.debug("#{Thread.current.name}: best score is #{@best[0]}") if before != after && !after.zero?
       end
     end
 
     def cycle(host, port, strength, threads)
-      clean(host, port, strength, threads)
       s = @scores.pop
       return unless s.valid?
       return unless s.host == host
@@ -154,7 +151,7 @@ module Zold
       AtomicFile.new(@cache).write((history + [score]).map(&:to_s).uniq.join("\n"))
     end
 
-    def history(max = 16)
+    def history
       if File.exist?(@cache)
         AtomicFile.new(@cache).read
           .split(/\n/)
@@ -162,7 +159,6 @@ module Zold
           .select(&:valid?)
           .sort_by(&:value)
           .reverse
-          .take(max)
       else
         []
       end

data/lib/zold/version.rb

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

metadata

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