zold 0.16.20 → 0.16.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fecaea03a1281af059406fd284d9b814fac0e4d0646ef6e65d8b4aacbf813169
-  data.tar.gz: 5e9a58d162b1333189e6346a25e2d24c411ec4bf3a3f074ab2c0a3d3e1185a57
+  metadata.gz: f9ed770c6f66e7627f1c23329a2ad5723c1d9ea8dd714db3341fcb48645597c9
+  data.tar.gz: 4055ca5daecab2762c3155406c597550188223e2358b1908dd5ed8240a4159a4
 SHA512:
-  metadata.gz: 9a71a411222753fc52f30ae2e4c9f7e374832840430cedfde87f5572ee7f1a67f41365bc17ac8fb708feaeb77ac8ad9e4c8c7137f61568d0734ba845f1561a47
-  data.tar.gz: aad4fc840d9e5c87315f6a4d1c4997e326511eb94910c1aec9496b89e37ea7c7926b0ae55d69f31bc069d374a946eebf12c395060b168a992d2f9c03ddb5a809
+  metadata.gz: 7ebc0ae599f38f53b31fd85b30e5beb2cb97c517dff0bd4a1ddb01b3d9e4b2138ed3fa8dfdf0ec741309ba0ed0eabe95b23703d985b48870c5b305ea1966fe7f
+  data.tar.gz: 7fb53797974d1af0adbfa2a19d99fc6e8c31e70c326c4a4b24b231d61fad6cd58c6d6a43b574d4b6efebec3f65eb1940f72a7db3c457a31f0ce84683a3d481e0

data/README.md

@@ -121,6 +121,12 @@ Grateful users of the system will pay "taxes" to your wallet
 for the maintenance of their wallets, and the system will occasionally
 send you bonuses for keeping the node online (approximately 1 ZLD per day).
 
+If you are lost, run this:
+
+```bash
+$ zold node --help
+```
+
 ## Frequently Asked Questions
 
 > Where are my RSA private/public keys?

data/bin/zold

@@ -105,7 +105,7 @@ Available options:"
       "Home directory (default: #{Dir.pwd})",
       default: Dir.pwd
     o.string '--network',
-      "The name of the network we work in (default: #{Zold::Wallet::MAIN_NETWORK}",
+      "The name of the network we work in (default: #{Zold::Wallet::MAIN_NETWORK})",
       required: true,
       default: Zold::Wallet::MAIN_NETWORK
     o.bool '-h', '--help', 'Show these instructions'

data/fixtures/scripts/_head.sh

@@ -49,7 +49,7 @@ function wait_for_file {
 
 function halt_nodes {
   for p in "$@"; do
-    pid=$(curl --silent "http://localhost:$p/pid?halt=test" || echo 'absent')
+    pid=$(curl --silent "http://127.0.0.1:$p/pid?halt=test" || echo 'absent')
     if [[ "${pid}" =~ ^[0-9]+$ ]]; then
       i=0
       while kill -0 ${pid}; do

data/fixtures/scripts/distribute-wallet.sh

@@ -5,12 +5,12 @@ function start_node {
   mkdir ${port}
   cd ${port}
   zold node --trace --invoice=DISTRWALLET@ffffffffffffffff \
-    --host=localhost --port=${port} --bind-port=${port} \
+    --host=127.0.0.1 --port=${port} --bind-port=${port} \
     --threads=0 --routine-immediately --never-reboot > log.txt &
   pid=$!
   echo ${pid} > pid
   cd ..
-  wait_for_url http://localhost:${port}/
+  wait_for_url http://127.0.0.1:${port}/
   echo ${port}
 }
 
@@ -24,9 +24,9 @@ trap "halt_nodes ${first} ${second}" EXIT
 # is linked to the first one. The --home argument specifies their
 # locations.
 zold --home=${first} remote clean
-zold --home=${first} remote add localhost ${second}
+zold --home=${first} remote add 127.0.0.1 ${second}
 zold --home=${second} remote clean
-zold --home=${second} remote add localhost ${first}
+zold --home=${second} remote add 127.0.0.1 ${first}
 
 # Locally we create a new root wallet (to avoid negative balance checking)
 # and connect our local Zold home to the first remote node. Then, we push
@@ -35,10 +35,10 @@ zold --home=${second} remote add localhost ${first}
 zold --public-key=id_rsa.pub create 0000000000000000
 zold pay --private-key=id_rsa 0000000000000000 NOPREFIX@aaaabbbbccccdddd 4.95 'For the book'
 zold remote clean
-zold remote add localhost ${first}
+zold remote add 127.0.0.1 ${first}
 zold push 0000000000000000
 zold remote clean
-zold remote add localhost ${second}
+zold remote add 127.0.0.1 ${second}
 
 # Here we fetch the wallet from the second remote node. The wallet has
 # to be visible there. We are doing a number of attempts with a small
@@ -58,7 +58,7 @@ done
 
 # Here we check the JSON of the first node to make sure all status
 # indicators are clean.
-json=$(curl --silent --show-error http://localhost:${first})
+json=$(curl --silent --show-error http://127.0.0.1:${first})
 if [ ! $(echo ${json} | jq -r '.entrance.queue') == "0" ]; then
   echo "The queue is not empty after PUSH, it's a bug"
   exit 5

data/fixtures/scripts/pull-on-start.sh

@@ -4,14 +4,14 @@ port=$(reserve_port)
 mkdir server
 cd server
 zold node --trace --invoice=PULLONSTART@ffffffffffffffff --no-metronome \
-  --host=localhost --port=${port} --bind-port=${port} \
+  --host=127.0.0.1 --port=${port} --bind-port=${port} \
   --threads=0 --standalone &
 cd ..
 
 wait_for_port ${port}
 
 zold remote clean
-zold remote add localhost ${port}
+zold remote add 127.0.0.1 ${port}
 
 zold --public-key=id_rsa.pub create abcdabcdabcdabcd
 zold push abcdabcdabcdabcd
@@ -22,9 +22,9 @@ second_port=$(reserve_port)
 mkdir second
 cd second
 zold remote clean
-zold remote add localhost ${port}
+zold remote add 127.0.0.1 ${port}
 zold node --trace --invoice=abcdabcdabcdabcd --no-metronome \
-  --host=localhost --port=${second_port} --bind-port=${second_port} \
+  --host=127.0.0.1 --port=${second_port} --bind-port=${second_port} \
   --threads=0 &
 
 wait_for_port ${second_port}

data/fixtures/scripts/push-and-pull.sh

@@ -5,7 +5,7 @@ port=$(reserve_port)
 mkdir server
 cd server
 zold node --trace --invoice=PUSHNPULL@ffffffffffffffff \
-  --host=localhost --port=${port} --bind-port=${port} \
+  --host=127.0.0.1 --port=${port} --bind-port=${port} \
   --threads=0 --standalone &
 pid=$!
 trap "halt_nodes ${port}" EXIT
@@ -14,7 +14,7 @@ cd ..
 wait_for_port ${port}
 
 zold remote clean
-zold remote add localhost ${port}
+zold remote add 127.0.0.1 ${port}
 zold remote trim
 zold remote show
 

data/fixtures/scripts/redeploy-on-upgrade.sh

@@ -7,7 +7,7 @@ function start_node {
   zold node $3 --nohup --nohup-command='touch restarted' --nohup-log=log --nohup-max-cycles=0 --nohup-log-truncate=10240 \
     --expose-version=$2 --save-pid=pid --routine-immediately \
     --verbose --trace --invoice=REDEPLOY@ffffffffffffffff \
-    --host=localhost --port=$1 --bind-port=$1 --threads=1 --strength=20 > /dev/null 2>&1
+    --host=127.0.0.1 --port=$1 --bind-port=$1 --threads=1 --strength=20 > /dev/null 2>&1
   wait_for_port $1
   cat pid
   cd ..
@@ -20,7 +20,7 @@ low=$(reserve_port)
 secondary=$(start_node ${low} 1.1.1)
 
 zold remote clean
-zold remote add localhost ${high} --home=${low} --skip-ping
+zold remote add 127.0.0.1 ${high} --home=${low} --skip-ping
 
 trap "halt_nodes ${high}" EXIT
 

data/fixtures/scripts/spread-wallets.sh

@@ -5,7 +5,7 @@ function start_node {
   mkdir ${port}
   cd ${port}
   zold node --trace --invoice=SPREADWALLETS@ffffffffffffffff \
-    --host=localhost --port=${port} --bind-port=${port} \
+    --host=127.0.0.1 --port=${port} --bind-port=${port} \
     --threads=0 > log.txt &
   pid=$!
   echo ${pid} > pid
@@ -19,16 +19,16 @@ second=$(start_node)
 trap "halt_nodes ${first} ${second}" EXIT
 
 zold --home=${first} remote clean
-zold --home=${first} remote add localhost ${second}
+zold --home=${first} remote add 127.0.0.1 ${second}
 zold --home=${second} remote clean
-zold --home=${second} remote add localhost ${first}
+zold --home=${second} remote add 127.0.0.1 ${first}
 
 zold --public-key=id_rsa.pub create 0000000000000000
 zold pay --private-key=id_rsa 0000000000000000 NOPREFIX@aaaabbbbccccdddd 4.95 'To help you, dude!'
-zold remote add localhost ${first}
+zold remote add 127.0.0.1 ${first}
 zold push 0000000000000000
 zold remote clean
-zold remote add localhost ${second}
+zold remote add 127.0.0.1 ${second}
 
 i=0
 until zold fetch 0000000000000000 --ignore-score-weakness; do
@@ -42,7 +42,7 @@ until zold fetch 0000000000000000 --ignore-score-weakness; do
   sleep 2
 done
 
-json=$(curl --silent --show-error http://localhost:${first})
+json=$(curl --silent --show-error http://127.0.0.1:${first})
 if [ ! $(echo ${json} | jq -r '.entrance.queue') == "0" ]; then
   echo "The queue is not empty after PUSH, it's a bug"
   exit -1

data/lib/zold/amount.rb

@@ -29,24 +29,25 @@ require 'rainbow'
 module Zold
   # Amount
   class Amount
-    # How many zents are in one ZLD: 2^FRACTION
-    FRACTION = 32
-
     # Maximum amount of zents
     MAX = 2**63
 
+    # How many zents are in one ZLD: 2^FRACTION
+    FRACTION = 32
+    private_constant :FRACTION
+
     def initialize(zents: nil, zld: nil)
       if !zents.nil?
         raise "Integer is required, while #{zents.class} provided: #{zents}" unless zents.is_a?(Integer)
         @zents = zents
       elsif !zld.nil?
         raise "Float is required, while #{zld.class} provided: #{zld}" unless zld.is_a?(Float)
-        @zents = (zld * 2**Amount::FRACTION).to_i
+        @zents = (zld * 2**FRACTION).to_i
       else
         raise 'You can\'t specify both coints and zld'
       end
-      raise "The amount is too big: #{@zents}" if @zents > Amount::MAX
-      raise "The amount is too small: #{@zents}" if @zents < -Amount::MAX
+      raise "The amount is too big: #{@zents}" if @zents > MAX
+      raise "The amount is too small: #{@zents}" if @zents < -MAX
     end
 
     ZERO = Amount.new(zents: 0)
@@ -56,7 +57,7 @@ module Zold
     end
 
     def to_zld(digits = 2)
-      format("%0.#{digits}f", @zents.to_f / 2**Amount::FRACTION)
+      format("%0.#{digits}f", @zents.to_f / 2**FRACTION)
     end
 
     def to_s
@@ -120,7 +121,7 @@ module Zold
     def *(other)
       raise '* may only work with a number' unless other.is_a?(Integer) || other.is_a?(Float)
       c = (@zents * other).to_i
-      raise "Overflow, can't multiply #{@zents} by #{m}" if c > Amount::MAX
+      raise "Overflow, can't multiply #{@zents} by #{m}" if c > MAX
       Amount.new(zents: c)
     end
 

data/lib/zold/commands/node.rb

@@ -172,9 +172,9 @@ module Zold
       Front.set(:logging, @log.debug?)
       home = File.expand_path(opts['home'])
       Front.set(:home, home)
-      @log.info("Time: #{Time.now.utc.iso8601}")
+      @log.info("Time: #{Time.now.utc.iso8601}; CPUs: #{Concurrent.processor_count}")
       @log.info("Home directory: #{home}")
-      @log.info("Ruby version: #{RUBY_VERSION}")
+      @log.info("Ruby version: #{RUBY_VERSION}/#{RUBY_PLATFORM}")
       @log.info("Zold gem version: #{Zold::VERSION}")
       @log.info("Zold protocol version: #{Zold::PROTOCOL}")
       @log.info("Network ID: #{opts['network']}")
@@ -182,7 +182,7 @@ module Zold
       port = opts[:port]
       address = "#{host}:#{port}".downcase
       @log.info("Node location: #{address}")
-      @log.info("Local address: http://localhost:#{opts['bind-port']}/")
+      @log.info("Local address: http://127.0.0.1:#{opts['bind-port']}/")
       @log.info("Remote nodes (#{@remotes.all.count}): \
 #{@remotes.all.map { |r| "#{r[:host]}:#{r[:port]}" }.join(', ')}")
       @log.info("Wallets at: #{@wallets.path}")

data/lib/zold/commands/routines/reconnect.rb

@@ -48,9 +48,9 @@ module Zold
         args << "--ignore-node=#{score.host}:#{score.port}" if score
         cmd.run(args + ['defaults']) unless @opts['routine-immediately']
         return if @opts['routine-immediately'] && @remotes.all.empty?
+        cmd.run(args + ['update'] + (@opts['never-reboot'] ? [] : ['--reboot']))
         cmd.run(args + ['trim'])
         cmd.run(args + ['select'])
-        cmd.run(args + ['update'] + (@opts['never-reboot'] ? [] : ['--reboot']))
         @log.info("Reconnected, there are #{@remotes.all.count} remote notes: \
 #{@remotes.all.map { |r| "#{r[:host]}:#{r[:port]}" }.join(', ')}")
       end

data/lib/zold/http.rb

@@ -22,7 +22,6 @@
 
 require 'rainbow'
 require 'uri'
-require 'timeout'
 require 'net/http'
 require 'backtrace'
 require 'zold/score'
@@ -56,9 +55,11 @@ module Zold
 
     # Read timeout in seconds
     READ_TIMEOUT = 1
+    private_constant :READ_TIMEOUT
 
     # Connect timeout in seconds
     CONNECT_TIMEOUT = 0.4
+    private_constant :CONNECT_TIMEOUT
 
     def initialize(uri:, score: Score::ZERO, network: 'test')
       @uri = uri.is_a?(URI) ? uri : URI(uri)
@@ -66,36 +67,32 @@ module Zold
       @network = network
     end
 
-    def get(timeout: Http::READ_TIMEOUT + Http::CONNECT_TIMEOUT)
+    def get(timeout: READ_TIMEOUT + CONNECT_TIMEOUT)
       http = Net::HTTP.new(@uri.host, @uri.port)
       http.use_ssl = @uri.scheme == 'https'
       http.read_timeout = timeout
-      http.open_timeout = Http::CONNECT_TIMEOUT
+      http.open_timeout = CONNECT_TIMEOUT
       path = @uri.path
       path += '?' + @uri.query if @uri.query
-      Timeout.timeout(timeout + Http::CONNECT_TIMEOUT) do
-        http.request_get(path, headers)
-      end
+      http.request_get(path, headers)
     rescue StandardError => e
       Error.new(e)
     end
 
-    def put(body, timeout: Http::READ_TIMEOUT + Http::CONNECT_TIMEOUT)
+    def put(body, timeout: READ_TIMEOUT + CONNECT_TIMEOUT)
       http = Net::HTTP.new(@uri.host, @uri.port)
       http.use_ssl = @uri.scheme == 'https'
       http.read_timeout = timeout
-      http.open_timeout = Http::CONNECT_TIMEOUT
+      http.open_timeout = CONNECT_TIMEOUT
       path = @uri.path
       path += '?' + @uri.query if @uri.query
-      Timeout.timeout(timeout + Http::CONNECT_TIMEOUT) do
-        http.request_put(
-          path, body,
-          headers.merge(
-            'Content-Type': 'text/plain',
-            'Content-Length': body.length.to_s
-          )
+      http.request_put(
+        path, body,
+        headers.merge(
+          'Content-Type': 'text/plain',
+          'Content-Length': body.length.to_s
         )
-      end
+      )
     rescue StandardError => e
       Error.new(e)
     end

data/lib/zold/id.rb

@@ -27,12 +27,16 @@
 module Zold
   # Id of the wallet
   class Id
+    # Pattern to match the ID
+    PTN = Regexp.new('^[0-9a-fA-F]{16}$')
+    private_constant :PTN
+
     def initialize(id = nil)
       if id.nil?
         @id = rand(2**32..2**64 - 1)
       else
         raise "Invalid wallet ID type: #{id.class.name}" unless id.is_a?(String)
-        raise "Invalid wallet ID: #{id}" unless id =~ /^[0-9a-fA-F]{16}$/
+        raise "Invalid wallet ID: #{id}" unless id =~ PTN
         @id = Integer("0x#{id}", 16)
       end
     end

data/lib/zold/log.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'rainbow'
+require 'monitor'
 
 STDOUT.sync = true
 
@@ -50,12 +51,12 @@ module Zold
     class Sync
       def initialize(log)
         @log = log
-        @mutex = Mutex.new
+        @monitor = Monitor.new
       end
 
       def debug(msg)
         return unless debug?
-        @mutex.synchronize do
+        @monitor.synchronize do
           @log.debug(msg)
         end
       end
@@ -66,7 +67,7 @@ module Zold
 
       def info(msg)
         return unless info?
-        @mutex.synchronize do
+        @monitor.synchronize do
           @log.info(msg)
         end
       end
@@ -76,7 +77,7 @@ module Zold
       end
 
       def error(msg)
-        @mutex.synchronize do
+        @monitor.synchronize do
           @log.error(msg)
         end
       end

data/lib/zold/node/front.rb

@@ -185,7 +185,7 @@ in #{Age.new(@start, limit: 1)}")
 
     get '/' do
       content_type('application/json')
-      JSON.pretty_generate(
+      pretty(
         version: settings.opts['expose-version'],
         alias: settings.node_alias,
         network: settings.opts['network'],
@@ -222,7 +222,7 @@ in #{Age.new(@start, limit: 1)}")
       id = Id.new(params[:id])
       copy_of(id) do |wallet|
         content_type('application/json')
-        JSON.pretty_generate(
+        pretty(
           version: settings.opts['expose-version'],
           alias: settings.node_alias,
           protocol: settings.protocol,
@@ -244,7 +244,7 @@ in #{Age.new(@start, limit: 1)}")
       id = Id.new(params[:id])
       copy_of(id) do |wallet|
         content_type('application/json')
-        JSON.pretty_generate(
+        pretty(
           version: settings.opts['expose-version'],
           alias: settings.node_alias,
           protocol: settings.protocol,
@@ -367,7 +367,7 @@ in #{Age.new(@start, limit: 1)}")
         status(304)
         return
       end
-      JSON.pretty_generate(
+      pretty(
         version: settings.opts['expose-version'],
         alias: settings.node_alias,
         score: score.to_h,
@@ -377,7 +377,7 @@ in #{Age.new(@start, limit: 1)}")
 
     get '/remotes' do
       content_type('application/json')
-      JSON.pretty_generate(
+      pretty(
         version: settings.opts['expose-version'],
         alias: settings.node_alias,
         score: score.to_h,
@@ -470,6 +470,13 @@ in #{Age.new(@start, limit: 1)}")
       POSIX::Spawn::Child.new('ps', 'ax').out.split("\n").select { |t| t.include?('zold') }
     end
 
+    def pretty(json)
+      json.to_json
+      # There seems to be some issue with memory leakage at this line, that's
+      # why it's disabled for now:
+      # JSON.pretty_generate(json)
+    end
+
     def score
       settings.zache.get(:score, lifetime: settings.opts['network'] == Wallet::MAIN_NETWORK ? 60 : 0) do
         b = settings.farm.best

data/lib/zold/remotes.rb

@@ -51,6 +51,7 @@ module Zold
 
     # Default nodes and their ports
     DEFS = CSV.read(File.expand_path(File.join(File.dirname(__FILE__), '../../resources/remotes')))
+    private_constant :DEFS
 
     # Empty, for standalone mode
     class Empty
@@ -119,7 +120,7 @@ module Zold
       end
     end
 
-    def initialize(file:, network: 'test', timeout: Http::READ_TIMEOUT + Http::CONNECT_TIMEOUT)
+    def initialize(file:, network: 'test', timeout: 60)
       @file = file
       @network = network
       @timeout = timeout
@@ -141,19 +142,19 @@ module Zold
     end
 
     def defaults
-      Remotes::DEFS.each do |r|
+      DEFS.each do |r|
         add(r[0], r[1].to_i)
       end
     end
 
-    def exists?(host, port = Remotes::PORT)
+    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?
       !load.find { |r| r[:host] == host.downcase && r[:port] == port }.nil?
     end
 
-    def add(host, port = Remotes::PORT)
+    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?
@@ -166,7 +167,7 @@ module Zold
       end
     end
 
-    def remove(host, port = Remotes::PORT)
+    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?
@@ -203,7 +204,7 @@ module Zold
             error(r[:host], r[:port])
             log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message} in #{Age.new(start)}")
             log.debug(Backtrace.new(e).to_s)
-            remove(r[:host], r[:port]) if errors > Remotes::TOLERANCE
+            remove(r[:host], r[:port]) if errors > TOLERANCE
           end
         end
         idx += 1
@@ -212,7 +213,7 @@ module Zold
       pool.kill unless pool.wait_for_termination(5 * 60)
     end
 
-    def error(host, port = Remotes::PORT)
+    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)
@@ -232,7 +233,7 @@ module Zold
     end
 
     def default?(host, port)
-      !Remotes::DEFS.find { |r| r[0] == host && r[1].to_i == port }.nil?
+      !DEFS.find { |r| r[0] == host && r[1].to_i == port }.nil?
     end
 
     private

data/lib/zold/tax.rb

@@ -55,6 +55,7 @@ module Zold
 
     # Text prefix for taxes details
     PREFIX = 'TAXES'
+    private_constant :PREFIX
 
     def initialize(wallet, ignore_score_weakness: false)
       raise "The wallet must be of type Wallet: #{wallet.class.name}" unless wallet.is_a?(Wallet)
@@ -64,38 +65,38 @@ module Zold
 
     # Check whether this tax payment already exists in the wallet.
     def exists?(details)
-      !@wallet.txns.find { |t| t.details.start_with?("#{Tax::PREFIX} ") && t.details == details }.nil?
+      !@wallet.txns.find { |t| t.details.start_with?("#{PREFIX} ") && t.details == details }.nil?
     end
 
     def details(best)
-      "#{Tax::PREFIX} #{best.reduced(Tax::EXACT_SCORE).to_text}"
+      "#{PREFIX} #{best.reduced(EXACT_SCORE).to_text}"
     end
 
     def pay(pvt, best)
-      @wallet.sub([Tax::MAX_PAYMENT, debt].min, best.invoice, pvt, details(best))
+      @wallet.sub([MAX_PAYMENT, debt].min, best.invoice, pvt, details(best))
     end
 
     def in_debt?
-      debt > Tax::TRIAL
+      debt > TRIAL
     end
 
     def to_text
-      "A=#{@wallet.age.round} hours, F=#{Tax::FEE.to_i}z/th, T=#{@wallet.txns.count}t, Paid=#{paid}"
+      "A=#{@wallet.age.round} hours, F=#{FEE.to_i}z/th, T=#{@wallet.txns.count}t, Paid=#{paid}"
     end
 
     def debt
-      Tax::FEE * @wallet.txns.count * @wallet.age - paid
+      FEE * @wallet.txns.count * @wallet.age - paid
     end
 
     def paid
       txns = @wallet.txns
       scored = txns.map do |t|
         pfx, body = t.details.split(' ', 2)
-        next if pfx != Tax::PREFIX || body.nil?
+        next if pfx != PREFIX || body.nil?
         score = Score.parse_text(body)
-        next if !score.valid? || score.value != Tax::EXACT_SCORE
+        next if !score.valid? || score.value != EXACT_SCORE
         next if score.strength < Score::STRENGTH && !@ignore_score_weakness
-        next if t.amount > Tax::MAX_PAYMENT
+        next if t.amount > MAX_PAYMENT
         t
       end.compact.uniq(&:details)
       scored.empty? ? Amount::ZERO : scored.map(&:amount).inject(&:+) * -1

data/lib/zold/txn.rb

@@ -36,9 +36,11 @@ module Zold
   class Txn
     # Regular expression for details
     RE_DETAILS = '[a-zA-Z0-9 @\!\?\*_\-\.:,\']+'
+    private_constant :RE_DETAILS
 
     # Regular expression for prefix
     RE_PREFIX = '[a-zA-Z0-9]+'
+    private_constant :RE_PREFIX
 
     attr_reader :id, :date, :amount, :prefix, :bnf, :details, :sign
     attr_writer :sign, :amount, :bnf
@@ -60,12 +62,12 @@ module Zold
       raise 'Prefix can\'t be NIL' if prefix.nil?
       raise "Prefix is too short: \"#{prefix}\"" if prefix.length < 8
       raise "Prefix is too long: \"#{prefix}\"" if prefix.length > 32
-      raise "Prefix is wrong: \"#{prefix}\" (#{Txn::RE_PREFIX})" unless prefix =~ Regexp.new("^#{Txn::RE_PREFIX}$")
+      raise "Prefix is wrong: \"#{prefix}\" (#{RE_PREFIX})" unless prefix =~ Regexp.new("^#{RE_PREFIX}$")
       @prefix = prefix
       raise 'Details can\'t be NIL' if details.nil?
       raise 'Details can\'t be empty' if details.empty?
       raise "Details are too long: \"#{details}\"" if details.length > 512
-      raise "Wrong details \"#{details}\" (#{Txn::RE_DETAILS})" unless details =~ Regexp.new("^#{Txn::RE_DETAILS}$")
+      raise "Wrong details \"#{details}\" (#{RE_DETAILS})" unless details =~ Regexp.new("^#{RE_DETAILS}$")
       @details = details
     end
 
@@ -115,20 +117,23 @@ module Zold
       t
     end
 
+    # Pattern to match the transaction from text
+    PTN = Regexp.new(
+      '^' + [
+        '(?<id>[0-9a-f]{4})',
+        '(?<date>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)',
+        '(?<amount>[0-9a-f]{16})',
+        "(?<prefix>#{RE_PREFIX})",
+        '(?<bnf>[0-9a-f]{16})',
+        "(?<details>#{RE_DETAILS})",
+        '(?<sign>[A-Za-z0-9+/]+={0,3})?'
+      ].join(';') + '$'
+    )
+    private_constant :PTN
+
     def self.parse(line, idx = 0)
-      regex = Regexp.new(
-        '^' + [
-          '(?<id>[0-9a-f]{4})',
-          '(?<date>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)',
-          '(?<amount>[0-9a-f]{16})',
-          "(?<prefix>#{Txn::RE_PREFIX})",
-          '(?<bnf>[0-9a-f]{16})',
-          "(?<details>#{Txn::RE_DETAILS})",
-          '(?<sign>[A-Za-z0-9+/]+={0,3})?'
-        ].join(';') + '$'
-      )
       clean = line.strip
-      parts = regex.match(clean)
+      parts = PTN.match(clean)
       raise "Invalid line ##{idx}: #{line.inspect} #{regex}" unless parts
       txn = Txn.new(
         Hexnum.parse(parts[:id]).to_i,

data/lib/zold/version.rb

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

data/test/commands/test_taxes.rb

@@ -54,7 +54,7 @@ class TestTaxes < Zold::Test
       end
       remotes = home.remotes
       score = Zold::Score.new(host: 'localhost', port: 80, strength: 1, invoice: 'NOPREFIX@0000000000000000')
-      Zold::Tax::EXACT_SCORE.times { score = score.next }
+      10.times { score = score.next }
       remotes.add(score.host, score.port)
       stub_request(:get, "http://#{score.host}:#{score.port}/").to_return(
         status: 200,

data/test/node/test_farm.rb

@@ -164,7 +164,7 @@ class FarmTest < Zold::Test
         end
         farm = Zold::Farm.new('NOPREFIX5@ffffffffffffffff', file, log: log)
         assert_equal(1, farm.best.count)
-        assert(log.msgs.find { |m| m.include?('Invalid score') })
+        assert(log.msgs.find { |m| m.include?('Invalid score') }, log.msgs)
       end
     end
   end

data/test/node/test_front.rb

@@ -26,6 +26,7 @@ require 'time'
 require 'securerandom'
 require 'threads'
 require 'zold/score'
+require 'memory_profiler'
 require_relative '../test__helper'
 require_relative 'fake_node'
 require_relative '../fake_home'
@@ -38,6 +39,21 @@ class FrontTest < Zold::Test
     Zold::Front
   end
 
+  # Use this test to check how much memory is being used after doing a large
+  # number of routine operations. There should be no suspicious information
+  # in the report, which will be printed to the console.
+  def test_memory_leakage
+    skip
+    report = MemoryProfiler.report(top: 10) do
+      FakeNode.new(log: test_log).run(['--no-metronome', '--network=foo', '--threads=0']) do |port|
+        100.times do
+          Zold::Http.new(uri: "http://localhost:#{port}/", network: 'foo').get
+        end
+      end
+    end
+    report.pretty_print
+  end
+
   def test_renders_front_json
     FakeNode.new(log: test_log).run(['--no-metronome', '--network=foo', '--threads=0']) do |port|
       res = Zold::Http.new(uri: "http://localhost:#{port}/", network: 'foo').get

data/test/test_http.rb

@@ -25,8 +25,10 @@ require 'tmpdir'
 require 'uri'
 require 'webmock/minitest'
 require 'zold/score'
+require 'random-port'
 require_relative 'test__helper'
 require_relative '../lib/zold/http'
+require_relative '../lib/zold/verbose_thread'
 
 # Http test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -70,35 +72,45 @@ class TestHttp < Zold::Test
     assert_equal('200', res.code)
   end
 
-  def test_terminates_on_timeout
-    stub_request(:get, 'http://the-fake-host-99/').to_return do
-      sleep 100
-      { body: 'This should never be returned!' }
-    end
-    res = Zold::Http.new(uri: 'http://the-fake-host-99/').get
-    assert_equal('599', res.code)
-  end
-
   def test_doesnt_terminate_on_long_call
-    require 'random-port'
     WebMock.allow_net_connect!
     RandomPort::Pool::SINGLETON.acquire do |port|
       thread = Thread.start do
-        server = TCPServer.new(port)
-        loop do
+        Zold::VerboseThread.new(test_log).run do
+          server = TCPServer.new(port)
           client = server.accept
+          client.puts("HTTP/1.1 200 OK\nContent-Length: 4\n\n")
           sleep 1
-          client.puts("HTTP/1.1 200 OK\nContent-Length: 4\n\nGood")
+          client.puts('Good')
           client.close
         end
       end
-      res = Zold::Http.new(uri: "http://localhost:#{port}/").get(timeout: 2)
+      sleep 0.25
+      res = Zold::Http.new(uri: "http://127.0.0.1:#{port}/").get(timeout: 2)
       assert_equal('200', res.code, res)
       thread.kill
       thread.join
     end
   end
 
+  def test_terminates_on_timeout
+    WebMock.allow_net_connect!
+    RandomPort::Pool::SINGLETON.acquire do |port|
+      thread = Thread.start do
+        Zold::VerboseThread.new(test_log).run do
+          server = TCPServer.new(port)
+          server.accept
+          sleep 400
+        end
+      end
+      sleep 0.25
+      res = Zold::Http.new(uri: "http://127.0.0.1:#{port}/").get(timeout: 0.1)
+      assert_equal('599', res.code, res)
+      thread.kill
+      thread.join
+    end
+  end
+
   def test_sends_valid_version_header
     stub_request(:get, 'http://some-host-3/')
       .with(headers: { 'X-Zold-Version' => Zold::VERSION })

data/zold.gemspec

@@ -76,11 +76,12 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'usagewatch_ext', '0.2.1'
   s.add_runtime_dependency 'xcop', '0.6'
   s.add_runtime_dependency 'zache', '0.3.1'
-  s.add_runtime_dependency 'zold-score', '0.2.0'
+  s.add_runtime_dependency 'zold-score', '0.2.2'
   s.add_development_dependency 'codecov', '0.1.13'
+  s.add_development_dependency 'memory_profiler', '0.9.12'
   s.add_development_dependency 'minitest', '5.11.3'
   s.add_development_dependency 'minitest-hooks', '1.5.0'
-  s.add_development_dependency 'random-port', '0.3.0'
+  s.add_development_dependency 'random-port', '0.3.1'
   s.add_development_dependency 'rdoc', '4.3.0'
   s.add_development_dependency 'rspec-rails', '3.8.1'
   s.add_development_dependency 'webmock', '3.4.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.16.20
+  version: 0.16.21
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-11 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -324,14 +324,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +346,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.13
+- !ruby/object:Gem::Dependency
+  name: memory_profiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.12
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -380,14 +394,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement