zold 0.13.16 → 0.13.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3183919e57351739619bf518c2870c25ec473985
-  data.tar.gz: 67635b036d23a07bf3f1d92d4c6b4513b3c9748f
+  metadata.gz: 7eec03fc76e3770883b2f0febeb6ff7d565cc0a0
+  data.tar.gz: 121dd3d167f8a894c6c7a6a222f67bcb67356621
 SHA512:
-  metadata.gz: 75dfb39205b5b048471e8589462ca9dbf6607930077fdd649a80f2356bd5e7a10c35fd3064ed239bbb9f642b88eb039ac3d8c43e76b2bb36c43345169789943d
-  data.tar.gz: 7ead05305c2aa61831803d031c1bd0da5dfa24894598a1a96d789cc2a6dc45b452aaba2e2daace99ba423767656546431386f9b7c37d768b72cf59571a29c44a
+  metadata.gz: 5a34855ba55d40556a011ab566962db6e072b6b97cf4eeef28491a9eb66d23db54fd64511e43ff69fec78324efcd75002dc6061ec5eb1c0773013eab2e26ea66
+  data.tar.gz: d04f55a00d7578f0ba7dca6b7ed1c9a351c5da22a0376e44fce9363ddb39c2484ec8f2194c0f4a65df82b605882af91d9a41d64d3681ca55d50840f12e22cec8

data/README.md

@@ -11,7 +11,6 @@
 [![Gem Version](https://badge.fury.io/rb/zold.svg)](http://badge.fury.io/rb/zold)
 [![Test Coverage](https://img.shields.io/codecov/c/github/zold-io/zold.svg)](https://codecov.io/github/zold-io/zold?branch=master)
 
-[![Dependency Status](https://gemnasium.com/zold-io/zold.svg)](https://gemnasium.com/zold-io/zold)
 [![Maintainability](https://api.codeclimate.com/v1/badges/7489c1d2bacde40ffc09/maintainability)](https://codeclimate.com/github/zold-io/zold/maintainability)
 
 **NOTICE**: It's an experiment and a very early draft! Please, feel free to

data/lib/zold/commands/node.rb

@@ -59,8 +59,8 @@ module Zold
         o.integer '--bind-port',
           "TCP port to listen on (default: #{Remotes::PORT})",
           default: Remotes::PORT
-        o.string '--host', "Host name (default: #{ip})",
-          default: ip
+        o.string '--host',
+          'Host name (will attempt to auto-detect it, if not specified)'
         o.integer '--strength',
           "The strength of the score (default: #{Score::STRENGTH})",
           default: Score::STRENGTH
@@ -125,6 +125,9 @@ module Zold
       @log.info("Home directory: #{Dir.pwd}")
       @log.info("Ruby version: #{RUBY_VERSION}")
       @log.info("Zold gem version: #{Zold::VERSION}")
+      host = opts[:host] || ip
+      address = "#{host}:#{opts[:port]}".downcase
+      @log.info("Node location: #{address}")
       Front.set(
         :server_settings,
         Logger: WebrickLog.new(@log),
@@ -138,7 +141,6 @@ module Zold
       Front.set(:wallets, @wallets)
       Front.set(:remotes, @remotes)
       Front.set(:copies, @copies)
-      address = "#{opts[:host]}:#{opts[:port]}".downcase
       Front.set(:address, address)
       entrance = Entrance.new(@wallets, @remotes, @copies, address, log: @log)
       Front.set(:entrance, entrance)
@@ -160,7 +162,7 @@ module Zold
       Front.set(:farm, farm)
       metronome = metronome(farm, entrance, opts)
       begin
-        @log.info("Starting up the web front at http://#{opts[:host]}:#{opts[:port]}...")
+        @log.info("Starting up the web front at http://#{host}:#{opts[:port]}...")
         Front.run!
       ensure
         farm.stop
@@ -242,7 +244,8 @@ module Zold
       addr = Socket.ip_address_list.detect do |i|
         i.ipv4? && !i.ipv4_loopback? && !i.ipv4_multicast? && !i.ipv4_private?
       end
-      addr.nil? ? '127.0.0.1' : addr.ip_address
+      raise 'Can\'t detect your IP address, you have to specify it in --host' if addr.nil?
+      addr.ip_address
     end
 
     # Log facility for nohup

data/lib/zold/node/farm.rb

@@ -69,7 +69,7 @@ module Zold
           VerboseThread.new(@log).run do
             Thread.current.name = "farm-#{t}"
             loop do
-              if @scores.length < 4
+              if @scores.length < threads
                 @scores << Score.new(
                   Time.now, host, port, @invoice,
                   strength: strength
@@ -79,22 +79,22 @@ module Zold
               next unless s.valid?
               next unless s.host == host
               next unless s.port == port
-              next if s.expired?(20)
-              next if s.strength < strength
+              next unless s.strength >= strength
+              n = s.next
               @semaphore.synchronize do
-                save(s)
                 before = @best.map(&:value).max
-                @best << s
+                save(n)
+                @best << n
                 after = @best.map(&:value).max
-                @best.reject! { |b| b.value < after }
-                @log.debug("#{Thread.current.name}: best score is #{@best[0]}") if before != after
+                @best = @best.reject(&:expired?).sort_by(&:value).reverse.take(threads)
+                @log.debug("#{Thread.current.name}: best score is #{@best[0]}") if before != after && !after.zero?
               end
-              @scores << s.next
+              @scores << n
             end
           end
         end
       end
-      @log.info("Farm started with #{threads} threads at #{host}:#{port}")
+      @log.info("Farm started with #{threads} threads at #{host}:#{port}, strength is #{strength}")
     end
 
     def stop
@@ -119,7 +119,6 @@ module Zold
         AtomicFile.new(@cache).read
           .split(/\n/)
           .map { |t| Score.parse(t) }
-          .reject(&:expired?)
           .select(&:valid?)
           .sort_by(&:value)
           .reverse

data/lib/zold/remotes.rb

@@ -36,7 +36,7 @@ module Zold
     PORT = 4096
 
     # At what amount of errors we delete the remote automatically
-    TOLERANCE = 50
+    TOLERANCE = 20
 
     # Empty, for standalone mode
     class Empty

data/lib/zold/version.rb

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

data/test/node/test_farm.rb

@@ -60,4 +60,24 @@ class FarmTest < Minitest::Test
       farm.stop
     end
   end
+
+  def test_drops_expired_scores_from_history
+    Dir.mktmpdir 'test' do |dir|
+      cache = File.join(dir, 'cache')
+      score = Zold::Score.new(
+        Time.parse('2017-07-19T21:24:51Z'),
+        'some-host', 9999, 'NOPREFIX@ffffffffffffffff', ['13f7f01'],
+        strength: 6
+      )
+      File.write(cache, score.to_s)
+      farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', cache, log: test_log)
+      farm.start(score.host, score.port, threads: 1, strength: score.strength)
+      10.times do
+        break if farm.best[0].value.zero?
+        sleep(1)
+      end
+      assert_equal(0, farm.best[0].value)
+      farm.stop
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.13.16
+  version: 0.13.17
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby