zold 0.21.0 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08d854cecafd7b1690e4d00d3f10ab81e93c1a6ddc80691b7bd706a34e3914d6'
-  data.tar.gz: e8d569ab7b6d48f7293e98b55bb2fe52be904dc83a9039dde605be1a306692c8
+  metadata.gz: 4a04c52513e6e44079e0e39a5245cf1075fe740990fa73b94c44217214bb0272
+  data.tar.gz: f9b6b3183b4f587184557dfa88af90a45511098af6b9682e08a113976a618b24
 SHA512:
-  metadata.gz: 916db3539dfeb1a9307cb291192f10c30e2b10e566d2c222951b83bf0a1ff3db97488af147c926b924288abb899d2ac8b98845963f85ee2f1684293aa92b2091
-  data.tar.gz: a874b08ca61533b78daec42dac0437195c1ab10360c83bdfe5469b893a04526e744d5e3ecbcb951b9e662fece172788e40d44097124afbe0f9b1fcf338d1968e
+  metadata.gz: dc7ca238f71aa8c628c535f5e65a017c24293cedba569995ec8e0006bf082c3f2ccf2049e85f67bfbc59039fe3e898ed3438a8ed26a389010f18972a1d9e1005
+  data.tar.gz: 9d2a309a544d9b0199bd732edb15ca08458e76b293f75dbe90d498f1eda6457927f83f7818aec3b5dcfb53e64a5c5764fbcfd0e00d827e0be8f839691e7c9025

data/.rultor.yml

@@ -14,7 +14,7 @@ release:
     [[ "${tag}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || exit -1
     # gem build zold.gemspec
     # gem install --local zold-0.0.0.gem
-    # zold --version | grep -vq '0.0.0' && exit 1
+    # zold --version | grep -vq '0.0.0' && exit -1
     # zold remote update
     sed -i "s/0\.0\.0/${tag}/g" lib/zold/version.rb
     bundle install --no-color

data/Guardfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# Guardfile for Zold
+guard :minitest, all_after_pass: false, all_on_start: false do
+  # with Minitest::Unit
+  watch(%r{^test/(.*)\/?test_(.*)\.rb$})
+  watch(%r{^lib/zold/(.*/)?([^/]+)\.rb$}) { |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  watch(%r{^test/test_helper\.rb$}) { 'test' }
+end

data/lib/zold/commands/node.rb

@@ -149,8 +149,8 @@ module Zold
           'Skip Out Of Memory check and never exit, no matter how much RAM is consumed',
           default: false
         o.integer '--oom-limit',
-          'Maximum amount of memory we can consume, quit if we take more than that, in Mb (default: 512)',
-          default: 512
+          "Maximum amount of memory we can consume, quit if we take more than that, in Mb (default: #{oom_limit})",
+          default: oom_limit
         o.integer '--queue-limit',
           'The maximum number of wallets to be accepted via PUSH and stored in the queue (default: 256)',
           default: 256
@@ -440,6 +440,14 @@ module Zold
       addr.ip_address
     end
 
+    def oom_limit
+      require 'total'
+      Total::Mem.new.bytes / (1024 * 1024) / 2
+    rescue Total::CantDetect => e
+      @log.error(e.message)
+      512
+    end
+
     # Log facility for nohup
     class NohupLog
       def initialize(file, max)

data/lib/zold/node/front.rb

@@ -244,12 +244,12 @@ this is not a normal behavior, you may want to report a bug to our GitHub reposi
           protocol: settings.protocol,
           id: wallet.id.to_s,
           score: score.to_h,
-          wallets: total_wallets,
           mtime: wallet.mtime.utc.iso8601,
           size: wallet.size,
           digest: wallet.digest,
           copies: Copies.new(File.join(settings.copies, wallet.id)).all.count,
-          balance: wallet.balance.to_i
+          balance: wallet.balance.to_i,
+          txns: wallet.txns.count
         )
       end
     end
@@ -443,7 +443,6 @@ time to stop; use --skip-oom to never quit")
     end
 
     def total_wallets
-      return 256 unless settings.opts['no-cache']
       settings.zache.get(:wallets, lifetime: settings.opts['no-cache'] ? 0 : 60) do
         settings.wallets.count
       end

data/lib/zold/remotes.rb

@@ -159,33 +159,25 @@ module Zold
     end
 
     def exists?(host, port = PORT)
-      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
-      raise 'Host can\'t be nil' if host.nil?
-      raise 'Port can\'t be nil' if port.nil?
+      assert_host_info(host, port)
       list = Futex.new(@file).open(false) { load }
       !list.find { |r| r[:host] == host.downcase && r[:port] == port }.nil?
     end
 
     def add(host, port = PORT)
-      raise 'Host can\'t be nil' if host.nil?
-      raise 'Host can\'t be empty' if host.empty?
-      raise 'Port can\'t be nil' if port.nil?
-      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
-      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
+      assert_host_info(host, port)
       modify do |list|
         list + [{ host: host.downcase, port: port, score: 0, errors: 0 }]
       end
+      unerror(host, port)
     end
 
     def remove(host, port = PORT)
-      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
-      raise 'Host can\'t be nil' if host.nil?
-      raise 'Port can\'t be nil' if port.nil?
+      assert_host_info(host, port)
       modify do |list|
         list.reject { |r| r[:host] == host.downcase && r[:port] == port }
       end
+      unerror(host, port)
     end
 
     # Go through the list of remotes and call a provided block for each
@@ -208,6 +200,7 @@ module Zold
             network: @network
           )
           raise 'Took too long to execute' if (Time.now - start).round > @timeout
+          unerror(r[:host], r[:port])
         rescue StandardError => e
           error(r[:host], r[:port])
           log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message} in #{Age.new(start)}")
@@ -218,19 +211,24 @@ module Zold
     end
 
     def error(host, port = PORT)
-      raise 'Host can\'t be nil' if host.nil?
-      raise 'Port can\'t be nil' if port.nil?
-      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
+      assert_host_info(host, port)
       if_present(host, port) { |r| r[:errors] += 1 }
     end
 
+    def unerror(host, port = PORT)
+      assert_host_info(host, port)
+
+      if_present(host, port) do |remote|
+        remote[:errors] -= 1 if (remote[:errors]).positive?
+      end
+    end
+
     def rescore(host, port, score)
-      raise 'Host can\'t be nil' if host.nil?
-      raise 'Port can\'t be nil' if port.nil?
+      assert_host_info(host, port)
       raise 'Score can\'t be nil' if score.nil?
-      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
       raise 'Score has to be of type Integer' unless score.is_a?(Integer)
       if_present(host, port) { |r| r[:score] = score }
+      unerror(host, port)
     end
 
     def mtime
@@ -289,5 +287,15 @@ module Zold
         []
       end
     end
+
+    def assert_host_info(host, port)
+      raise 'Host can\'t be nil' if host.nil?
+      raise 'Host can\'t be empty' if host.empty?
+      raise 'Port can\'t be nil' if port.nil?
+      raise 'Port has to be of type Integer' unless port.is_a?(Integer)
+      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
+    end
   end
 end

data/lib/zold/version.rb

@@ -25,7 +25,7 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.21.0'
+  VERSION = '0.21.1'
   PROTOCOL = 2
   REPO = 'zold-io/zold'
 end

data/test/test_http.rb

@@ -112,23 +112,17 @@ class TestHttp < Zold::Test
     end
   end
 
-  # @todo #444:30min It's obvious that the test works (I can see that in
-  #  the console, but for some weird reason it doesn't work in Minitest. Try
-  #  to run it: ruby test/test_http.rb -n test_sends_correct_http_headers
-  #  If fails because of PUT HTTP request timeout. Let's find the problem,
-  #  fix it, and un-skip the test.
   def test_sends_correct_http_headers
-    skip
     WebMock.allow_net_connect!
     body = ''
     RandomPort::Pool::SINGLETON.acquire do |port|
       thread = Thread.start do
         Zold::VerboseThread.new(test_log).run do
-          server = TCPServer.new(port)
+          server = TCPServer.new('127.0.0.1', port)
           socket = server.accept
           loop do
             line = socket.gets
-            break if line.nil?
+            break if line.eql?("\r\n")
             test_log.info(line.inspect)
             body += line
           end

data/test/test_remotes.rb

@@ -261,6 +261,19 @@ class TestRemotes < Zold::Test
     end
   end
 
+  def test_unerror_remote
+    Dir.mktmpdir do |dir|
+      remotes = Zold::Remotes.new(file: File.join(dir, 'uu-90.csv'))
+      remotes.clean
+      remotes.add('192.168.0.1', 8081)
+      assert_equal remotes.all.last[:errors], 0
+      remotes.error('192.168.0.1', 8081)
+      assert_equal remotes.all.last[:errors], 1
+      remotes.unerror('192.168.0.1', 8081)
+      assert_equal remotes.all.last[:errors], 0
+    end
+  end
+
   def test_empty_remotes
     Time.stub :now, Time.mktime(2018, 1, 1) do
       remotes = Zold::Remotes::Empty.new

data/zold.gemspec

@@ -65,7 +65,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'concurrent-ruby', '1.1.3'
   s.add_runtime_dependency 'cucumber', '3.1.2' # has to stay here for Heroku
   s.add_runtime_dependency 'diffy', '3.2.1'
-  s.add_runtime_dependency 'futex', '>=0.8.1'
+  s.add_runtime_dependency 'futex', '0.8.1'
   s.add_runtime_dependency 'get_process_mem', '~>0.2'
   s.add_runtime_dependency 'json', '2.1.0'
   s.add_runtime_dependency 'memory_profiler', '0.9.12'
@@ -81,12 +81,15 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'sys-proctable', '1.2.1'
   s.add_runtime_dependency 'thin', '1.7.2'
   s.add_runtime_dependency 'threads', '>=0.3'
+  s.add_runtime_dependency 'total', '>=0.2.0'
   s.add_runtime_dependency 'typhoeus', '1.3.1'
   s.add_runtime_dependency 'usagewatch_ext', '0.2.1'
   s.add_runtime_dependency 'xcop', '>=0.6'
   s.add_runtime_dependency 'zache', '>=0.7.0'
   s.add_runtime_dependency 'zold-score', '0.4.4'
   s.add_development_dependency 'codecov', '0.1.13'
+  s.add_development_dependency 'guard', '2.15.0'
+  s.add_development_dependency 'guard-minitest', '2.4.6'
   s.add_development_dependency 'minitest', '5.11.3'
   s.add_development_dependency 'minitest-fail-fast', '0.1.0'
   s.add_development_dependency 'minitest-hooks', '1.5.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-24 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -70,14 +70,14 @@ dependencies:
   name: futex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
@@ -290,6 +290,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: total
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -374,6 +388,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.13
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.15.0
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -504,6 +546,7 @@ files:
 - ".simplecov"
 - ".travis.yml"
 - Gemfile
+- Guardfile
 - INSTALL.md
 - LICENSE.txt
 - Procfile
@@ -706,7 +749,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.21.0!
+  Thanks for installing Zold 0.21.1!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try online wallet at: https://wts.zold.io