zold 0.13.17 → 0.13.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eec03fc76e3770883b2f0febeb6ff7d565cc0a0
-  data.tar.gz: 121dd3d167f8a894c6c7a6a222f67bcb67356621
+  metadata.gz: 803822a36daa76dbf38f3ee899fac369268b6f4c
+  data.tar.gz: 5a5a326d4b076e6906dc15e7930291d9cb8e9d4e
 SHA512:
-  metadata.gz: 5a34855ba55d40556a011ab566962db6e072b6b97cf4eeef28491a9eb66d23db54fd64511e43ff69fec78324efcd75002dc6061ec5eb1c0773013eab2e26ea66
-  data.tar.gz: d04f55a00d7578f0ba7dca6b7ed1c9a351c5da22a0376e44fce9363ddb39c2484ec8f2194c0f4a65df82b605882af91d9a41d64d3681ca55d50840f12e22cec8
+  metadata.gz: 37506ab72e6affb6f9b8b46786608fae5726ad70f390bd309954b3f495d78e00b7f88b3d12a7a08ad9c81f1ff6bad268c4fe729e0db9d9e90adb832b4be64254
+  data.tar.gz: d516c13ac21efa8a51daffa5cae34009f5716886a77f4c96959f0af9dbcc9b7bb53036eb51cb5aa91f7518fc01c62abb4ee132470923d55db48ce72f8d57194f

data/README.md

@@ -6,7 +6,7 @@
 [![We recommend RubyMine](http://www.elegantobjects.org/rubymine.svg)](https://www.jetbrains.com/ruby/)
 
 [![Build Status](https://travis-ci.org/zold-io/zold.svg)](https://travis-ci.org/zold-io/zold)
-[![Build status](https://ci.appveyor.com/api/projects/status/ypctxm5ohrtp2kr4?svg=true)](https://ci.appveyor.com/project/zold-io/zold)
+[![Build status](https://ci.appveyor.com/api/projects/status/15ola3lb03opv14m?svg=true)](https://ci.appveyor.com/project/yegor256/zold-wcn4o)
 [![PDD status](http://www.0pdd.com/svg?name=zold-io/zold)](http://www.0pdd.com/p?name=zold-io/zold)
 [![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)
@@ -201,6 +201,10 @@ network. You can see the full list of nodes at `/remotes` URL of your node.
 
   * `best` is ... something not important to you.
 
+  * `history` is the amount of scores currently saved on the disc. The
+    farm keeps them there in case the node gets restarted. It will load
+    them back and reuse.
+
 `entrance` is the place where all new wallets arive and get merged and pushed
 further. The health of this point is critical to the entire node. Some
 numbers it includes must be watched carefully.

data/lib/zold/commands/node.rb

@@ -155,18 +155,15 @@ 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]
-      )
-      Front.set(:farm, farm)
-      metronome = metronome(farm, entrance, opts)
-      begin
-        @log.info("Starting up the web front at http://#{host}:#{opts[:port]}...")
-        Front.run!
-      ensure
-        farm.stop
-        metronome.stop
+      farm.start(opts[:host], opts[:port], threads: opts[:threads], strength: opts[:strength]) do
+        Front.set(:farm, farm)
+        metronome = metronome(farm, entrance, opts)
+        begin
+          @log.info("Starting up the web front at http://#{host}:#{opts[:port]}...")
+          Front.run!
+        ensure
+          metronome.stop
+        end
       end
     end
 

data/lib/zold/commands/push.rb

@@ -83,7 +83,7 @@ Available options:"
       content = AtomicFile.new(wallet.path).read
       response = r.http("/wallet/#{wallet.id}#{opts['sync'] ? '?sync=true' : ''}").put(content)
       if response.code == '304'
-        @log.info("#{r}: same version of #{wallet.id} there")
+        @log.info("#{r}: same version of #{wallet.id} there, in #{(Time.now - start).round(2)}s")
         return 0
       end
       r.assert_code(200, response)

data/lib/zold/node/farm.rb

@@ -53,7 +53,8 @@ module Zold
       {
         threads: @threads.count,
         scores: @scores.size,
-        best: @best.count
+        best: @best.count,
+        history: history.count
       }
     end
 
@@ -68,33 +69,17 @@ module Zold
         Thread.new do
           VerboseThread.new(@log).run do
             Thread.current.name = "farm-#{t}"
-            loop do
-              if @scores.length < threads
-                @scores << Score.new(
-                  Time.now, host, port, @invoice,
-                  strength: strength
-                )
-              end
-              s = @scores.pop
-              next unless s.valid?
-              next unless s.host == host
-              next unless s.port == port
-              next unless s.strength >= strength
-              n = s.next
-              @semaphore.synchronize do
-                before = @best.map(&:value).max
-                save(n)
-                @best << n
-                after = @best.map(&:value).max
-                @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 << n
-            end
+            loop { cycle(host, port, strength, threads) }
           end
         end
       end
       @log.info("Farm started with #{threads} threads at #{host}:#{port}, strength is #{strength}")
+      return unless block_given?
+      begin
+        yield
+      ensure
+        stop
+      end
     end
 
     def stop
@@ -110,8 +95,31 @@ module Zold
 
     private
 
+    def cycle(host, port, strength, threads)
+      if @scores.length < threads
+        zero = Score.new(Time.now, host, port, @invoice, strength: strength)
+        @scores << zero
+        @best << zero
+      end
+      s = @scores.pop
+      return unless s.valid?
+      return unless s.host == host
+      return unless s.port == port
+      return unless s.strength >= strength
+      n = s.next
+      @semaphore.synchronize do
+        before = @best.map(&:value).max
+        save(n)
+        @best << n
+        after = @best.map(&:value).max
+        @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 << n
+    end
+
     def save(score)
-      AtomicFile.new(@cache).write((history + [score]).map(&:to_s).join("\n"))
+      AtomicFile.new(@cache).write((history + [score]).map(&:to_s).uniq.join("\n"))
     end
 
     def history(max = 16)

data/lib/zold/score.rb

@@ -46,6 +46,7 @@ module Zold
       @invoice = invoice
       @suffixes = suffixes
       @strength = strength
+      @created = Time.now
     end
 
     # The default no-value score.
@@ -140,7 +141,8 @@ module Zold
         hash: value.zero? ? nil : hash,
         expired: expired?,
         valid: valid?,
-        minutes: ((Time.now - @time) / 60).to_i
+        minutes: ((Time.now - @time) / 60).to_i,
+        created: @created.utc.iso8601
       }
     end
 

data/lib/zold/version.rb

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

data/test/node/test_farm.rb

@@ -26,25 +26,40 @@ require_relative '../../lib/zold/log'
 require_relative '../../lib/zold/node/farm'
 
 class FarmTest < Minitest::Test
+  def test_renders_in_json
+    Dir.mktmpdir 'test' do |dir|
+      farm = Zold::Farm.new('NOPREFIX@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
+        100.times { count += farm.to_json[:history] }
+        assert(count > 0)
+      end
+    end
+  end
+
   def test_makes_best_score_in_background
     Dir.mktmpdir 'test' do |dir|
       farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
-      farm.start('localhost', 80, threads: 4, strength: 2)
-      sleep 0.1 while farm.best.empty? || farm.best[0].value.zero?
-      assert(farm.best[0].value > 0)
-      farm.stop
+      farm.start('localhost', 80, threads: 4, strength: 2) do
+        sleep 0.1 while farm.best.empty? || farm.best[0].value.zero?
+        score = farm.best[0]
+        assert(!score.expired?)
+        assert(score.value > 0)
+      end
     end
   end
 
   def test_correct_score_from_empty_farm
     Dir.mktmpdir 'test' do |dir|
       farm = Zold::Farm.new('NOPREFIX@cccccccccccccccc', File.join(dir, 'f'), log: test_log)
-      farm.start('example.com', 8080, threads: 0, strength: 1)
-      score = farm.best[0]
-      assert_equal(0, score.value)
-      assert_equal('example.com', score.host)
-      assert_equal(8080, score.port)
-      farm.stop
+      farm.start('example.com', 8080, threads: 0, strength: 1) do
+        score = farm.best[0]
+        assert(!score.expired?)
+        assert_equal(0, score.value)
+        assert_equal('example.com', score.host)
+        assert_equal(8080, score.port)
+      end
     end
   end
 
@@ -52,12 +67,13 @@ class FarmTest < Minitest::Test
     Dir.mktmpdir 'test' do |dir|
       cache = File.join(dir, 'cache')
       farm = Zold::Farm.new('NOPREFIX@cccccccccccccccc', cache, log: test_log)
-      farm.start('example.com', 8080, threads: 0, strength: 1)
-      score = farm.best[0]
-      assert_equal(0, score.value)
-      assert_equal('example.com', score.host)
-      assert_equal(8080, score.port)
-      farm.stop
+      farm.start('example.com', 8080, threads: 0, strength: 1) do
+        score = farm.best[0]
+        assert_equal(0, score.value)
+        assert(!score.expired?)
+        assert_equal('example.com', score.host)
+        assert_equal(8080, score.port)
+      end
     end
   end
 
@@ -66,18 +82,18 @@ class FarmTest < Minitest::Test
       cache = File.join(dir, 'cache')
       score = Zold::Score.new(
         Time.parse('2017-07-19T21:24:51Z'),
-        'some-host', 9999, 'NOPREFIX@ffffffffffffffff', ['13f7f01'],
+        'some-host', 9999, 'NOPREFIX@ffffffffffffffff', %w[13f7f01 b2b32b 4ade7e],
         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)
+      farm.start(score.host, score.port, threads: 1, strength: score.strength) do
+        100.times do
+          sleep(0.1)
+          break if farm.best[0].value.zero?
+        end
+        assert_equal(0, farm.best[0].value)
       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.17
+  version: 0.13.18
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby