zold 0.14.23 → 0.14.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e655198a8ea3c0a9138c5f9b9d2659163cf5a64a
-  data.tar.gz: 6439cd7caedd7c330fe7290a5287dcd0c47d789c
+  metadata.gz: e8d71880e2c5c0b0d18b9af54c062dc5782bdca4
+  data.tar.gz: b25ac38601d91489b7da16813a96784edd57bcb7
 SHA512:
-  metadata.gz: ac548ed4b690c03c0bcf84c1961faff7c6460d8af7e677619a5ef15049f460767cf911bdef2c2512964f4bf70ffacf1872e23a8647dd3eaa8a1d3e2592667eb5
-  data.tar.gz: d278d016675843be28fa12df17c2958bdbf07fbc46e283aa3fd6a6e1fe922deb7893e28035c66578b57e98fbfa7b5ab65530fc94fb6940616cd610078520c884
+  metadata.gz: fd62a234221ae8733f83d090637c66730fb694743a63bd126604f92384986d6db36d1cd865cc6002ff384fb68411e4cfcae929abe478a3a7932b3687c193ca3d
+  data.tar.gz: 89f71e08e1dfa5ca33cd63f2274c78f2441098053d5145dfdbf01cb0b9f0dc19a5179b58bbe317476a70eb7eaaa62cadaf19e2d130da7bb4880eeaf56079c516

data/.rultor.yml

@@ -7,6 +7,7 @@ install: |
   sudo gem install pdd
 release:
   script: |-
+    export RUBYOPT="-W0"
     [[ "${tag}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || exit -1
     rm -rf *.gem
     sed -i "s/0\.0\.0/${tag}/g" lib/zold/version.rb

data/.travis.yml

@@ -11,6 +11,7 @@ install:
   - gem install pdd
 script:
   - pdd -f /dev/null
+  - export RUBYOPT="-W0"
   - rake --quiet
 after_success:
   - "bash <(curl -s https://codecov.io/bash)"

data/fixtures/scripts/_head.sh

@@ -12,10 +12,11 @@ function reserve_port {
 }
 
 function wait_for_url {
+  i=0
   while ! curl --silent --fail $1 > /dev/null; do
-    ((p++)) || sleep 5
-    if ((p==30)); then
-      echo "URL $1 is not available after $p seconds of waiting"
+    ((i++)) || sleep 0
+    if ((i==30)); then
+      echo "URL $1 is not available after ${i} attempts"
       exit 12
     fi
     sleep 5
@@ -23,10 +24,11 @@ function wait_for_url {
 }
 
 function wait_for_port {
+  i=0
   while ! nc -z localhost $1; do
-    ((p++)) || sleep 5
-    if ((p==30)); then
-      echo "Port $1 is not available after $p seconds of waiting"
+    ((i++)) || sleep 0
+    if ((i==30)); then
+      echo "Port $1 is not available after ${i} attempts"
       exit 13
     fi
     sleep 5
@@ -34,10 +36,11 @@ function wait_for_port {
 }
 
 function wait_for_file {
+  i=0
   while [ ! -f $1 ]; do
-    ((c++)) || sleep 5
-    if ((c==30)); then
-      echo "File $1 not found, giving up after $c seconds of waiting"
+    ((i++)) || sleep 0
+    if ((i==30)); then
+      echo "File $1 not found, giving up after ${i} attempts"
       exit 14
     fi
     sleep 5
@@ -48,13 +51,14 @@ function halt_nodes {
   for p in "$@"; do
     pid=$(curl --silent "http://localhost:$p/pid?halt=test" || echo 'absent')
     if [[ "${pid}" =~ ^[0-9]+$ ]]; then
+      i=0
       while kill -0 ${pid}; do
-        ((c++)) || sleep 5
-        if ((c==30)); then
-          echo "Waiting for process ${pid} to die"
+        ((i++)) || sleep 0
+        if ((i==30)); then
+          echo "Process ${pid} didn't die, it's a bug"
           exit 15
         fi
-        echo "Still waiting for process ${pid} to die, cycle no.${c}"
+        echo "Still waiting for process ${pid} to die, attempt no.${i}"
         sleep 5
       done
       echo "Process ${pid} is dead!"

data/fixtures/scripts/distribute-wallet.sh

@@ -44,15 +44,16 @@ zold remote add localhost ${second}
 # to be visible there. We are doing a number of attempts with a small
 # delay between them, in order to give the first node a chance to distribute
 # the wallet.
+i=0
 until zold fetch 0000000000000000 --ignore-score-weakness; do
   echo 'Failed to fetch, let us try again'
-  ((i++)) || sleep 1
+  ((i++)) || sleep 0
   if ((i==5)); then
     cat ${first}/log.txt
     echo "The wallet has not been distributed, after ${i} attempts"
     exit 9
   fi
-  sleep 1
+  sleep 5
 done
 
 # Here we check the JSON of the first node to make sure all status
@@ -74,14 +75,15 @@ fi
 # Now, we remove the wallet from the second node and expect the first
 # one to "spread" it again, almost immediately.
 rm ${second}/0000000000000000.z
+i=0
 until zold fetch 0000000000000000 --ignore-score-weakness; do
   echo 'Failed to fetch, let us try again'
-  ((i++)) || sleep 1
+  ((i++)) || sleep 0
   if ((i==5)); then
     cat ${first}/log.txt
     echo "The wallet 0000000000000000 has not been spread, after ${i} attempts"
     exit 8
   fi
-  sleep 1
+  sleep 5
 done
 

data/fixtures/scripts/spread-wallets.sh

@@ -30,9 +30,10 @@ zold push 0000000000000000
 zold remote clean
 zold remote add localhost ${second}
 
+i=0
 until zold fetch 0000000000000000 --ignore-score-weakness; do
   echo 'Failed to fetch, let us try again'
-  ((i++)) || sleep 2
+  ((i++)) || sleep 0
   if ((i==5)); then
     cat ${first}/log.txt
     echo "The wallet has not been distributed, after ${i} attempts"

data/lib/zold/commands/remote.rb

@@ -83,6 +83,9 @@ Available options:"
         o.integer '--min-score',
           "The minimum score required for winning the election (default: #{Tax::EXACT_SCORE})",
           default: Tax::EXACT_SCORE
+        o.integer '--max-winners',
+          'The maximum amount of election winners the election (default: 1)',
+          default: 1
         o.bool '--force',
           'Add/remove if if this operation is not possible',
           default: false
@@ -197,11 +200,11 @@ Available options:"
         r.assert_score_value(score, opts['min-score']) unless opts['ignore-score-value']
         scores << score
       end
-      scores = scores.sample(1)
+      scores = scores.sample(opts['max-winners'])
       if scores.empty?
         @log.info("No winners elected out of #{@remotes.all.count} remotes")
       else
-        @log.info("Elected: #{scores[0]}")
+        scores.each { |s| @log.info("Elected: #{s}") }
       end
       scores
     end
@@ -239,7 +242,7 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
         end
         if deep
           json['all'].each do |s|
-            add(s['host'], s['port'], opts) unless @remotes.exists?(s['host'], s['port'])
+            @remotes.add(s['host'], s['port'])
           end
         end
         capacity << { host: score.host, port: score.port, count: json['all'].count }

data/lib/zold/node/async_entrance.rb

@@ -32,7 +32,12 @@ require_relative '../verbose_thread'
 module Zold
   # The entrance
   class AsyncEntrance
-    THREADS = Concurrent.processor_count * 4
+    # How many threads to use for processing
+    THREADS = Concurrent.processor_count * 8
+
+    # Max items in the queue. If there will be more, push() requests
+    # will be rejected.
+    MAX_QUEUE = 128
 
     def initialize(entrance, dir, log: Log::Quiet.new)
       raise 'Entrance can\'t be nil' if entrance.nil?
@@ -90,6 +95,7 @@ module Zold
 
     # Always returns an array with a single ID of the pushed wallet
     def push(id, body)
+      raise 'Queue is too long, try again later' if Dir.new(@dir).count > AsyncEntrance::MAX_QUEUE
       @mutex.synchronize do
         AtomicFile.new(File.join(@dir, id.to_s)).write(body)
       end

data/lib/zold/node/front.rb

@@ -25,6 +25,7 @@ STDOUT.sync = true
 require 'json'
 require 'sinatra/base'
 require 'webrick'
+require 'get_process_mem'
 require 'diffy'
 require 'concurrent'
 require_relative '../backtrace'
@@ -94,9 +95,10 @@ while #{settings.address} is in '#{settings.network}'"
         error(400, 'The score is weak') if s.strength < Score::STRENGTH && !settings.ignore_score_weakness
         if s.value > 3
           require_relative '../commands/remote'
-          Remote.new(remotes: settings.remotes, log: settings.log).run(
-            ['remote', 'add', s.host, s.port.to_s, '--force', "--network=#{settings.network}"]
-          )
+          cmd = Remote.new(remotes: settings.remotes, log: settings.log)
+          cmd.run(['remote', 'add', s.host, s.port.to_s, '--force', "--network=#{settings.network}"])
+          cmd.run(%w[remote trim])
+          cmd.run(%w[remote select])
         else
           settings.log.debug("#{request.url}: the score is too weak: #{s}")
         end
@@ -153,6 +155,7 @@ while #{settings.address} is in '#{settings.network}'"
         score: score.to_h,
         pid: Process.pid,
         cpus: Concurrent.processor_count,
+        memory: GetProcessMem.new.inspect.bytes,
         platform: RUBY_PLATFORM,
         uptime: `uptime`.strip,
         threads: "#{Thread.list.select { |t| t.status == 'run' }.count}/#{Thread.list.count}",

data/lib/zold/remotes.rb

@@ -149,7 +149,6 @@ module Zold
       raise 'Port can\'t be zero' if port.zero?
       raise 'Port can\'t be negative' if port.negative?
       raise 'Port can\'t be over 65536' if port > 0xffff
-      raise "#{host}:#{port} already exists" if exists?(host, port)
       modify do |list|
         list + [{ host: host.downcase, port: port, score: 0 }]
       end

data/lib/zold/score.rb

@@ -128,7 +128,7 @@ module Zold
         port,
         invoice,
         suffixes.join(' ')
-      ].join(' ')
+      ].join(' ').strip
     end
 
     def to_h

data/lib/zold/version.rb

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

data/test/node/test_front.rb

@@ -178,4 +178,43 @@ class FrontTest < Minitest::Test
     sec = (Time.now - start) / total
     test_log.info("Average response time is #{sec.round(2)}s")
   end
+
+  def app
+    Zold::Front
+  end
+
+  def test_headers_are_being_set_correctly
+    Time.stub :now, Time.at(0) do
+      FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
+        response = Zold::Http.new(uri: URI("http://localhost:#{port}/"), score: nil).get
+        assert_equal(
+          'no-cache',
+          response.header['Cache-Control']
+        )
+        assert_equal(
+          'close',
+          response.header['Connection']
+        )
+        assert_equal(
+          app.settings.version,
+          response.header['X-Zold-Version']
+        )
+        assert_equal(
+          app.settings.protocol.to_s,
+          response.header[Zold::Http::PROTOCOL_HEADER]
+        )
+        assert_equal(
+          '*',
+          response.header['Access-Control-Allow-Origin']
+        )
+        score = Zold::Score.new(
+          time: Time.now, host: 'localhost', port: port, invoice: 'NOPREFIX@ffffffffffffffff', strength: 2
+        )
+        assert_equal(
+          score.to_s,
+          response.header[Zold::Http::SCORE_HEADER]
+        )
+      end
+    end
+  end
 end

data/zold.gemspec

@@ -59,6 +59,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'diffy', '~>3.2'
   s.add_runtime_dependency 'dry-struct', '~>0.5.0'
   s.add_runtime_dependency 'dry-types', '~>0.13.2'
+  s.add_runtime_dependency 'get_process_mem', '0.2.2'
   s.add_runtime_dependency 'json', '~>1.8'
   s.add_runtime_dependency 'openssl', '~>2.1'
   s.add_runtime_dependency 'rainbow', '~>3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.23
+  version: 0.14.24
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-28 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.2
+- !ruby/object:Gem::Dependency
+  name: get_process_mem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement