zold 0.14.11 → 0.14.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2b8ac4c48c2e84846da60308cd5f19915bf4832
-  data.tar.gz: e9f5d5362f6e95bd36370d04e5363fdeb0809a19
+  metadata.gz: eebbf694c3af2594b3ff82b988bfdc53a5c926f2
+  data.tar.gz: a10ed4895198184566d4495fa8ddc7a5d6fb42bb
 SHA512:
-  metadata.gz: 17b505d402d6ed1a76848560ebea98989178c2704c676976eff4c82d3e44647e94d771ed15f428d2d604521772481c7fa4187183ba8058dd6be9355b6ea0c9ed
-  data.tar.gz: 8126b35c3fafbb825047fa1fbc43450fc3f20d76dd85ef6ca6eccdb6b60bb16c176a52d14c9eedfed465bdf18d32449d6c6db70e6bfc315be167b9b05a34c9d0
+  metadata.gz: 2b064373631472b0ea87c017d662ba5886fc6a4258a60387431bc4cc71fd65b47de25c20f5aea3f3031680bc07d1c53d6ffd2de8523698be265794f8d96b5936
+  data.tar.gz: c39bd06b4edf7f3f520b7ed7732eb4130662354a0845897ac0087ac39684d9d8671da753d2bae087c68a4f02e5d158fa3c191ef67a4abf33e56caa57509bf5d6

data/fixtures/scripts/distribute-wallet.sh

@@ -49,7 +49,7 @@ until zold fetch 0000000000000000 --ignore-score-weakness; do
   if ((i==5)); then
     cat ${first}/log.txt
     echo "The wallet has not been distributed, after ${i} attempts"
-    exit -1
+    exit 9
   fi
   sleep 1
 done
@@ -59,15 +59,15 @@ done
 json=$(curl --silent --show-error http://localhost:${first})
 if [ ! $(echo ${json} | jq -r '.entrance.queue') == "0" ]; then
   echo "The queue is not empty after PUSH, it's a bug"
-  exit -1
+  exit 5
 fi
 if [ $(echo ${json} | jq -r '.entrance.history_size') == "0" ]; then
   echo "The history doesn't have a wallet, it's a bug"
-  exit -1
+  exit 6
 fi
 if [ ! $(echo ${json} | jq -r '.wallets') == "1" ]; then
   echo "The wallet is not there for some reason, it's a bug"
-  exit -1
+  exit 7
 fi
 
 # Now, we remove the wallet from the second node and expect the first
@@ -79,7 +79,7 @@ until zold fetch 0000000000000000 --ignore-score-weakness; do
   if ((i==5)); then
     cat ${first}/log.txt
     echo "The wallet has not been spread, after ${i} attempts"
-    exit -1
+    exit 8
   fi
   sleep 1
 done

data/lib/zold/metronome.rb

@@ -54,6 +54,7 @@ module Zold
       @routines.each do |r|
         @threads << Thread.start do
           Thread.current.name = r.class.name
+          Thread.current.priority = -100
           step = 0
           while alive
             start = Time.now

data/lib/zold/node/entrance.rb

@@ -53,6 +53,7 @@ module Zold
       raise 'Network can\'t be nil' if network.nil?
       @network = network
       @history = []
+      @speed = []
       @mutex = Mutex.new
     end
 
@@ -63,7 +64,8 @@ module Zold
     def to_json
       {
         'history': @history.join(', '),
-        'history_size': @history.count
+        'history_size': @history.count,
+        'speed': @speed.empty? ? 0 : (@speed.inject(&:+) / @speed.count)
       }
     end
 
@@ -94,8 +96,10 @@ module Zold
       end
       @mutex.synchronize do
         @history.shift if @history.length > 16
+        @speed.shift if @speed.length > 64
         wallet = @wallets.find(id)
         @history << "#{id}/#{sec}/#{modified.count}/#{wallet.balance.to_zld}/#{wallet.txns.count}t"
+        @speed << sec
       end
       modified
     end

data/lib/zold/node/farm.rb

@@ -77,6 +77,7 @@ module Zold
       @threads = (1..threads).map do |t|
         Thread.new do
           Thread.current.name = "f#{t}"
+          Thread.current.priority = -100
           loop do
             VerboseThread.new(@log).run do
               cycle(host, port, strength, threads)

data/lib/zold/node/spread_entrance.rb

@@ -68,6 +68,7 @@ module Zold
         @modified = Queue.new
         @push = Thread.start do
           Thread.current.abort_on_exception = true
+          Thread.current.priority = -100
           Thread.current.name = 'push'
           VerboseThread.new(@log).run(true) do
             loop do

data/lib/zold/remotes.rb

@@ -183,9 +183,11 @@ module Zold
       require_relative 'score'
       score = best.nil? ? Score::ZERO : best
       idx = 0
-      pool = Concurrent::FixedThreadPool.new([all.count, Concurrent.processor_count * 16].min, max_queue: 0)
+      pool = Concurrent::FixedThreadPool.new([all.count, Concurrent.processor_count * 4].min, max_queue: 0)
       all.each do |r|
         pool.post do
+          Thread.current.name = 'remotes'
+          Thread.current.priority = -100
           start = Time.now
           begin
             yield Remotes::Remote.new(r[:host], r[:port], score, idx, log: log, network: @network)

data/lib/zold/version.rb

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

data/test/node/test_entrance.rb

@@ -65,6 +65,7 @@ class TestEntrance < Minitest::Test
       e = Zold::Entrance.new(home.wallets, home.remotes, home.copies.root, 'x', log: test_log)
       e.push(wallet.id, File.read(wallet.path))
       assert(e.to_json[:history].include?(wallet.id.to_s))
+      assert(e.to_json[:speed].positive?)
     end
   end
 end

data/test/test_copies.rb

@@ -125,7 +125,7 @@ class TestCopies < Minitest::Test
       wallet = home.create_wallet(id)
       amount = Zold::Amount.new(zld: 1.99)
       key = Zold::Key.new(file: 'fixtures/id_rsa')
-      wallet.sub(amount, "NOPREFIX@#{id}", key, text)
+      wallet.sub(amount, "NOPREFIX@#{id}", key, text, time: Time.parse('2018-01-01T01:01:01Z'))
       File.read(wallet.path)
     end
   end

data/test/test_zold.rb

@@ -40,15 +40,17 @@ class TestZold < Minitest::Test
         script = File.join(dir, f)
         File.write(script, File.read('fixtures/scripts/_head.sh') + File.read(File.join('fixtures/scripts', f)))
         bin = File.join(Dir.pwd, 'bin/zold')
+        out = []
         Dir.chdir(dir) do
           Open3.popen2e("/bin/bash #{f} #{bin} 2>&1") do |stdin, stdout, thr|
             stdin.close
             until stdout.eof?
               line = stdout.gets
               test_log.debug(line)
+              out << line
             end
             code = thr.value.to_i
-            assert_equal(0, code, f)
+            assert_equal(0, code, f + out.join("\n"))
           end
         end
       end

metadata

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