zold 0.16.7 → 0.16.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a325af91de87bc2bd544f5d92a908eff34f4f114a88fa4cb9248ef286bff9404
-  data.tar.gz: 6e4fd9790fdcf55a23c206e60635c8fe6d45ad83eee4194697989b1f6bf5e51f
+  metadata.gz: 1399da979b61a827097b2b29a04b31920f6da3a65e2af8920fc493bbb52064ba
+  data.tar.gz: 255d50d0c687709e5b15f1ce1fc17eec7ab656b24a7c8356aec320d8620d911c
 SHA512:
-  metadata.gz: e827fbbefda31c28ad0fe24f23d5694d94997123f5163080a38ca8eee92c2048d4a0245b640896dab6210da8d2f22ac6dc325e3efe962b76cf3a714608534abe
-  data.tar.gz: 41ab159b3f635916fbb289384796e2fe5000aba409e86180248ec2903c684c86bd42642b357dd6e6d34b65b903df6648b4eda4938683cc9850880e3aaac0230a
+  metadata.gz: acf61ff6782dcb26a24f17f2f208cf64d7110c1204ccb048240433541c99978f298f21de0c96974aa7c67321acf800131e80a518d5eef37709c714e7642c1c41
+  data.tar.gz: d0816cade1db2f054b08a321aa7bde96a6af4eb3beb8ea42d54ba3d66b88c254464d48809e3a7e1fca80a155653420f21c779f93a2db1b7c255b38e652448187

data/bin/zold

@@ -23,11 +23,7 @@
 
 STDOUT.sync = true
 
-unless Gem.win_platform?
-  # For debug in production, see https://github.com/frsyuki/sigdump
-  ENV['SIGDUMP_PATH'] = File.join(Dir.pwd, "sigdump-#{Process.pid}.log")
-  require 'sigdump/setup'
-end
+start = Time.now
 
 require 'slop'
 require 'rainbow'
@@ -40,6 +36,7 @@ require_relative '../lib/zold/sync_wallets'
 require_relative '../lib/zold/cached_wallets'
 require_relative '../lib/zold/log'
 require_relative '../lib/zold/key'
+require_relative '../lib/zold/age'
 require_relative '../lib/zold/amount'
 require_relative '../lib/zold/copies'
 require_relative '../lib/zold/remotes'
@@ -60,9 +57,6 @@ unless ENV['RACK_ENV'] == 'test' || ARGV.find { |a| a == '--ignore-global-config
     body = IO.read(config)
     extra = body.split(/[\r\n]+/).map(&:strip)
     args += extra
-    log.debug("Found #{body.split(/\n/).length} lines in #{config}")
-  else
-    log.debug("Default config file #{config} not found")
   end
 end
 args += ARGV
@@ -131,6 +125,8 @@ Available options:"
 
   log = Zold::Log::Sync.new(log)
 
+  log.debug("Gem location: #{File.dirname(File.dirname(__FILE__))}")
+
   commands = opts.arguments.reject { |a| a.start_with?('-') }
   command = commands[0]
 
@@ -147,6 +143,7 @@ Available options:"
   home = File.expand_path(opts[:home])
   FileUtils.mkdir_p(home)
   Dir.chdir(home)
+  log.debug("Home directory: #{home}")
 
   zoldata = File.join(home, '.zoldata')
 
@@ -175,10 +172,15 @@ Available options:"
   )
   fremotes = File.join(zoldata, 'remotes')
   remotes = Zold::Remotes.new(file: fremotes, network: opts['network'])
-  remotes.defaults unless File.exist?(fremotes)
+  if File.exist?(fremotes)
+    log.debug("Remote nodes: #{remotes.all.count} total")
+  else
+    remotes.defaults
+    log.debug("Default remotes have been set: #{remotes.all.count} total")
+  end
   copies = File.join(zoldata, 'copies')
 
-  log.debug("Network: #{opts['network']}")
+  log.debug("Network: #{opts['network']} (#{opts['network'] == Zold::Wallet::MAIN_NETWORK ? 'main' : 'test'} net)")
 
   case command
   when 'node'
@@ -246,3 +248,5 @@ rescue StandardError => ex
   puts(ex.backtrace) if opts['trace']
   exit -1
 end
+
+log.debug("Successfully finished in #{Zold::Age.new(start)}")

data/fixtures/scripts/_head.sh

@@ -19,7 +19,7 @@ function wait_for_url {
       echo "URL $1 is not available after ${i} attempts"
       exit 12
     fi
-    sleep 5
+    sleep 2
   done
 }
 
@@ -31,7 +31,7 @@ function wait_for_port {
       echo "Port $1 is not available after ${i} attempts"
       exit 13
     fi
-    sleep 5
+    sleep 2
   done
 }
 
@@ -43,7 +43,7 @@ function wait_for_file {
       echo "File $1 not found, giving up after ${i} attempts"
       exit 14
     fi
-    sleep 5
+    sleep 2
   done
 }
 
@@ -59,7 +59,7 @@ function halt_nodes {
           exit 15
         fi
         echo "Still waiting for process ${pid} to die, attempt no.${i}"
-        sleep 5
+        sleep 2
       done
       echo "Process ${pid} is dead!"
     fi

data/fixtures/scripts/distribute-wallet.sh

@@ -53,7 +53,7 @@ until zold fetch 0000000000000000 --ignore-score-weakness; do
     echo "The wallet has not been distributed, after ${i} attempts"
     exit 9
   fi
-  sleep 5
+  sleep 2
 done
 
 # Here we check the JSON of the first node to make sure all status
@@ -81,6 +81,6 @@ until zold fetch 0000000000000000 --ignore-score-weakness; do
     cat ${first}/log.txt
     exit 8
   fi
-  sleep 5
+  sleep 2
 done
 

data/lib/zold/amount.rb

@@ -35,28 +35,28 @@ module Zold
     # Maximum amount of zents
     MAX = 2**63
 
-    def initialize(coins: nil, zld: nil)
-      if !coins.nil?
-        raise "Integer is required, while #{coins.class} provided: #{coins}" unless coins.is_a?(Integer)
-        @coins = coins
+    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)
-        @coins = (zld * 2**Amount::FRACTION).to_i
+        @zents = (zld * 2**Amount::FRACTION).to_i
       else
         raise 'You can\'t specify both coints and zld'
       end
-      raise "The amount is too big: #{@coins}" if @coins > Amount::MAX
-      raise "The amount is too small: #{@coins}" if @coins < -Amount::MAX
+      raise "The amount is too big: #{@zents}" if @zents > Amount::MAX
+      raise "The amount is too small: #{@zents}" if @zents < -Amount::MAX
     end
 
-    ZERO = Amount.new(coins: 0)
+    ZERO = Amount.new(zents: 0)
 
     def to_i
-      @coins
+      @zents
     end
 
     def to_zld(digits = 2)
-      format("%0.#{digits}f", @coins.to_f / 2**Amount::FRACTION)
+      format("%0.#{digits}f", @zents.to_f / 2**Amount::FRACTION)
     end
 
     def to_s
@@ -72,61 +72,61 @@ module Zold
 
     def ==(other)
       raise "== may only work with Amount: #{other}" unless other.is_a?(Amount)
-      @coins == other.to_i
+      @zents == other.to_i
     end
 
     def >(other)
       raise '> may only work with Amount' unless other.is_a?(Amount)
-      @coins > other.to_i
+      @zents > other.to_i
     end
 
     def <(other)
       raise '< may only work with Amount' unless other.is_a?(Amount)
-      @coins < other.to_i
+      @zents < other.to_i
     end
 
     def <=(other)
       raise '<= may only work with Amount' unless other.is_a?(Amount)
-      @coins <= other.to_i
+      @zents <= other.to_i
     end
 
     def <=>(other)
       raise '<= may only work with Amount' unless other.is_a?(Amount)
-      @coins <=> other.to_i
+      @zents <=> other.to_i
     end
 
     def +(other)
       raise '+ may only work with Amount' unless other.is_a?(Amount)
-      Amount.new(coins: @coins + other.to_i)
+      Amount.new(zents: @zents + other.to_i)
     end
 
     def -(other)
       raise '- may only work with Amount' unless other.is_a?(Amount)
-      Amount.new(coins: @coins - other.to_i)
+      Amount.new(zents: @zents - other.to_i)
     end
 
     def zero?
-      @coins.zero?
+      @zents.zero?
     end
 
     def negative?
-      @coins.negative?
+      @zents.negative?
     end
 
     def positive?
-      @coins.positive?
+      @zents.positive?
     end
 
     def *(other)
       raise '* may only work with a number' unless other.is_a?(Integer) || other.is_a?(Float)
-      c = (@coins * other).to_i
-      raise "Overflow, can't multiply #{@coins} by #{m}" if c > Amount::MAX
-      Amount.new(coins: c)
+      c = (@zents * other).to_i
+      raise "Overflow, can't multiply #{@zents} by #{m}" if c > Amount::MAX
+      Amount.new(zents: c)
     end
 
     def /(other)
       raise '/ may only work with a number' unless other.is_a?(Integer) || other.is_a?(Float)
-      Amount.new(coins: (@coins / other).to_i)
+      Amount.new(zents: (@zents / other).to_i)
     end
   end
 end

data/lib/zold/commands/taxes.rb

@@ -114,18 +114,26 @@ Available options:"
     def pay(wallet, opts)
       raise 'The wallet is absent' unless wallet.exists?
       tax = Tax.new(wallet)
-      debt = tax.debt
+      debt = total = tax.debt
       @log.info("The current debt of #{wallet.id}/#{wallet.txns.count}t is #{debt} (#{debt.to_i} zents), \
 the balance is #{wallet.balance}: #{tax.to_text}")
       unless tax.in_debt?
         @log.debug("No need to pay taxes yet, while the debt is less than #{Tax::TRIAL} (#{Tax::TRIAL.to_i} zents)")
         return
       end
-      top = top_scores(opts)
+      top = everybody = top_scores(opts)
+      paid = 0
       while debt > Tax::TRIAL
         if top.empty?
-          raise 'No acceptable remote nodes, try later' unless opts['ignore-nodes-absence']
-          @log.info('Not enough strong nodes in the network, try later')
+          msg = [
+            "There were #{everybody.count} remote nodes as tax collecting candidates;",
+            "#{paid} payments have been made",
+            "there was not enough score power to pay the total debt of #{total} for #{wallet.id};",
+            "the residual amount to pay is #{debt} (trial amount is #{Tax::TRIAL});",
+            "the formula ingredients are #{tax.to_text}"
+          ].join(' ')
+          raise msg unless opts['ignore-nodes-absence']
+          @log.info(msg)
           break
         end
         best = top.shift
@@ -135,7 +143,8 @@ the balance is #{wallet.balance}: #{tax.to_text}")
         end
         txn = tax.pay(Zold::Key.new(file: opts['private-key']), best)
         debt += txn.amount
-        @log.info("#{txn.amount} of taxes paid to #{txn.bnf}, #{debt} left to pay")
+        paid += 1
+        @log.info("#{txn.amount} of taxes paid to #{txn.bnf} (payment no.#{paid}), #{debt} left to pay")
       end
       @log.info('The wallet is in good standing, all taxes paid') unless tax.in_debt?
     end
@@ -144,6 +153,8 @@ the balance is #{wallet.balance}: #{tax.to_text}")
       raise 'The wallet is absent' unless wallet.exists?
       tax = Tax.new(wallet)
       @log.info(tax.debt)
+      @log.debug(tax.to_text)
+      @log.debug('Read the White Paper for more details: https://papers.zold.io/wp.pdf')
     end
 
     def show(_, _)

data/lib/zold/http.rb

@@ -55,7 +55,7 @@ module Zold
     PROTOCOL_HEADER = 'X-Zold-Protocol'
 
     # Read timeout in seconds
-    READ_TIMEOUT = 4
+    READ_TIMEOUT = 32
 
     # Connect timeout in seconds
     CONNECT_TIMEOUT = 4

data/lib/zold/node/emission.rb

@@ -48,7 +48,7 @@ module Zold
 
     def limit
       max = Amount::MAX
-      Amount.new(coins: (max * quota).to_i)
+      Amount.new(zents: (max * quota).to_i)
     end
 
     def check

data/lib/zold/node/front.rb

@@ -31,6 +31,7 @@ require 'diffy'
 require 'usagewatch_ext'
 require 'concurrent'
 require 'backtrace'
+require 'zache'
 require_relative '../version'
 require_relative '../size'
 require_relative '../wallet'
@@ -39,7 +40,6 @@ require_relative '../copies'
 require_relative '../log'
 require_relative '../id'
 require_relative '../http'
-require_relative '../cache'
 
 # The web front of the node.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -77,7 +77,7 @@ module Zold
       set :remotes, nil? # to be injected at node.rb
       set :copies, nil? # to be injected at node.rb
       set :node_alias, nil? # to be injected at node.rb
-      set :cache, Cache.new
+      set :zache, Zache.new
     end
     use Rack::Deflater
 
@@ -187,10 +187,10 @@ in #{Age.new(@start, limit: 1)}")
         protocol: settings.protocol,
         score: score.to_h,
         pid: Process.pid,
-        cpus: settings.cache.get(:cpus) { Concurrent.processor_count },
+        cpus: settings.zache.get(:cpus) { Concurrent.processor_count },
         memory: GetProcessMem.new.bytes.to_i,
         platform: RUBY_PLATFORM,
-        load: settings.cache.get(:load, lifetime: 5 * 60) { Usagewatch.uw_load.to_f },
+        load: settings.zache.get(:load, lifetime: 5 * 60) { Usagewatch.uw_load.to_f },
         threads: "#{Thread.list.select { |t| t.status == 'run' }.count}/#{Thread.list.count}",
         wallets: total_wallets,
         remotes: all_remotes.count,
@@ -435,13 +435,13 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     def all_remotes
-      settings.cache.get(:remotes, lifetime: settings.network == Wallet::MAIN_NETWORK ? 60 : 0) do
+      settings.zache.get(:remotes, lifetime: settings.network == Wallet::MAIN_NETWORK ? 60 : 0) do
         settings.remotes.all
       end
     end
 
     def score
-      settings.cache.get(:score, lifetime: settings.network == Wallet::MAIN_NETWORK ? 60 : 0) do
+      settings.zache.get(:score, lifetime: settings.network == Wallet::MAIN_NETWORK ? 60 : 0) do
         b = settings.farm.best
         raise 'Score is empty, there is something wrong with the Farm!' if b.empty?
         b[0]

data/lib/zold/patch.rb

@@ -84,7 +84,7 @@ module Zold
           balance = @txns.map(&:amount).map(&:to_i).inject(&:+).to_i
           if balance < txn.amount.to_i * -1 && !wallet.root?
             @log.error("Transaction ##{txn.id} attempts to make the balance of \
-#{wallet.id}/#{Amount.new(coins: balance).to_zld}/#{@txns.size} negative: #{txn.to_text}")
+#{wallet.id}/#{Amount.new(zents: balance).to_zld}/#{@txns.size} negative: #{txn.to_text}")
             next
           end
           unless Signature.new.valid?(@key, wallet.id, txn)

data/lib/zold/tax.rb

@@ -45,7 +45,9 @@ module Zold
     # This is how much we charge per one transaction per hour
     # of storage. A wallet of 4096 transactions will pay
     # approximately 16ZLD per year.
-    FEE_TXN_HOUR = Amount.new(zld: 16.0 / (365 * 24) / 4096)
+    # Here is the formula: 16.0 / (365 * 24) / 4096 = 1915
+    # But I like the 1917 number better.
+    FEE = Amount.new(zents: 1917)
 
     # The maximum debt we can tolerate at the wallet. If the debt
     # is bigger than this threshold, nodes must stop accepting PUSH.
@@ -77,10 +79,14 @@ module Zold
     end
 
     def to_text
-      "A=#{@wallet.age}, F=#{Tax::FEE_TXN_HOUR}, T=#{@wallet.txns.count}"
+      "A=#{@wallet.age.round} hours, F=#{Tax::FEE.to_i}z/th, T=#{@wallet.txns.count}t, Paid=#{paid}"
     end
 
     def debt
+      Tax::FEE * @wallet.txns.count * @wallet.age - paid
+    end
+
+    def paid
       txns = @wallet.txns
       scored = txns.map do |t|
         pfx, body = t.details.split(' ', 2)
@@ -91,9 +97,7 @@ module Zold
         next if t.amount > Tax::MAX_PAYMENT
         t
       end.compact.uniq(&:details)
-      paid = scored.empty? ? Amount::ZERO : scored.map(&:amount).inject(&:+)
-      owned = Tax::FEE_TXN_HOUR * txns.count * @wallet.age
-      owned - paid
+      scored.empty? ? Amount::ZERO : scored.map(&:amount).inject(&:+)
     end
   end
 end

data/lib/zold/txn.rb

@@ -133,7 +133,7 @@ module Zold
       txn = Txn.new(
         Hexnum.parse(parts[:id]).to_i,
         Time.parse(parts[:date]),
-        Amount.new(coins: Hexnum.parse(parts[:amount]).to_i),
+        Amount.new(zents: Hexnum.parse(parts[:amount]).to_i),
         parts[:prefix],
         Id.new(parts[:bnf]),
         parts[:details]

data/lib/zold/version.rb

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

data/test/node/test_front.rb

@@ -326,7 +326,7 @@ class FrontTest < Minitest::Test
         assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.code }
         cycles = 50
         cycles.times do
-          wallet.sub(Zold::Amount.new(coins: 10), "NOPREFIX@#{Zold::Id.new}", key)
+          wallet.sub(Zold::Amount.new(zents: 10), "NOPREFIX@#{Zold::Id.new}", key)
           Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").put(IO.read(wallet.path))
           assert_equal('200', Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.code)
         end

data/test/test_amount.rb

@@ -52,8 +52,8 @@ class TestAmount < Minitest::Test
     assert(amount != Zold::Amount::ZERO)
   end
 
-  def test_parses_coins
-    amount = Zold::Amount.new(coins: 900_000_000)
+  def test_parses_zents
+    amount = Zold::Amount.new(zents: 900_000_000)
     assert(
       amount.to_s.include?('0.21ZLD'),
       "#{amount} is not equal to '0.21ZLD'"
@@ -61,7 +61,7 @@ class TestAmount < Minitest::Test
   end
 
   def test_compares_amounts
-    amount = Zold::Amount.new(coins: 700_000_000)
+    amount = Zold::Amount.new(zents: 700_000_000)
     assert(
       amount > Zold::Amount::ZERO,
       "#{amount} is not greater than zero"

data/test/test_tax.rb

@@ -39,23 +39,23 @@ require_relative '../lib/zold/score'
 # License:: MIT
 class TestTax < Minitest::Test
   def test_print_fee
-    test_log.info("Fee in zents: #{Zold::Tax::FEE_TXN_HOUR.to_i}")
+    test_log.info("Fee in zents: #{Zold::Tax::FEE.to_i}")
   end
 
   def test_calculates_tax_for_one_year
     FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
+      a = 10_000
       wallet.add(
         Zold::Txn.new(
           1,
-          Time.now - 24 * 60 * 60 * 365,
+          Time.now - a * 60 * 60,
           Zold::Amount.new(zld: 19.99),
           'NOPREFIX', Zold::Id.new, '-'
         )
       )
       tax = Zold::Tax.new(wallet)
-      assert(tax.debt > Zold::Amount.new(coins: 16_770_000))
-      assert(tax.debt < Zold::Amount.new(coins: 16_790_000))
+      assert_equal(Zold::Tax::FEE * a, tax.debt, tax.to_text)
     end
   end
 
@@ -97,7 +97,7 @@ class TestTax < Minitest::Test
         Zold::Txn.new(
           1,
           Time.now,
-          Zold::Amount.new(coins: 95_596_800),
+          Zold::Amount.new(zents: 95_596_800),
           'NOPREFIX', Zold::Id.new('912ecc24b32dbe74'),
           "TAXES 6 5b5a21a9 b2.zold.io 1000 DCexx0hG 912ecc24b32dbe74 \
 386d4a ec9eae 306e3d 119d073 1c00dba 1376703 203589 5b55f7"

data/test/test_wallet.rb

@@ -132,10 +132,10 @@ class TestWallet < Minitest::Test
       wallet = home.create_wallet
       time = Time.now
       key = Zold::Key.new(file: 'fixtures/id_rsa')
-      wallet.add(Zold::Txn.new(1, time, Zold::Amount.new(coins: 1), 'NOPREFIX', Zold::Id.new, '-'))
-      wallet.sub(Zold::Amount.new(coins: 2), "NOPREFIX@#{Zold::Id.new}", key, time: time)
-      wallet.add(Zold::Txn.new(2, time, Zold::Amount.new(coins: 3), 'NOPREFIX', Zold::Id.new, '-'))
-      wallet.sub(Zold::Amount.new(coins: 4), "NOPREFIX@#{Zold::Id.new}", key, time: time)
+      wallet.add(Zold::Txn.new(1, time, Zold::Amount.new(zents: 1), 'NOPREFIX', Zold::Id.new, '-'))
+      wallet.sub(Zold::Amount.new(zents: 2), "NOPREFIX@#{Zold::Id.new}", key, time: time)
+      wallet.add(Zold::Txn.new(2, time, Zold::Amount.new(zents: 3), 'NOPREFIX', Zold::Id.new, '-'))
+      wallet.sub(Zold::Amount.new(zents: 4), "NOPREFIX@#{Zold::Id.new}", key, time: time)
       assert_equal('3, 1, -2, -4', wallet.txns.map(&:amount).map(&:to_i).join(', '))
     end
   end
@@ -219,7 +219,7 @@ class TestWallet < Minitest::Test
         sum += t.amount
       end
       assert(
-        sum == Zold::Amount.new(coins: 235_965_503_242),
+        sum == Zold::Amount.new(zents: 235_965_503_242),
         "#{sum} (#{sum.to_i}) is not equal to #{Zold::Amount.new(zld: 54.94)}"
       )
     end

data/test/test_zold.rb

@@ -35,6 +35,8 @@ class TestZold < Minitest::Test
   def test_all_scripts
     Dir.new('fixtures/scripts').select { |f| f =~ /\.sh$/ && !f.start_with?('_') }.each do |f|
       # next unless f == 'push-and-pull.sh'
+      start = Time.now
+      test_log.debug("\n\n#{f} running...")
       Dir.mktmpdir do |dir|
         FileUtils.cp('fixtures/id_rsa.pub', dir)
         FileUtils.cp('fixtures/id_rsa', dir)
@@ -55,6 +57,7 @@ class TestZold < Minitest::Test
           end
         end
       end
+      test_log.debug("\n\n#{f} done in #{Zold::Age.new(start)}")
     end
   end
 

data/zold.gemspec

@@ -68,7 +68,6 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'rubocop', '0.58.1' # has to stay here for Heroku
   s.add_runtime_dependency 'rubocop-rspec', '~>1' # has to stay here for Heroku
   s.add_runtime_dependency 'semantic', '~>1'
-  s.add_runtime_dependency 'sigdump', '~>0'
   s.add_runtime_dependency 'sinatra', '~>2'
   s.add_runtime_dependency 'slop', '~>4'
   s.add_runtime_dependency 'sys-proctable', '~>1'
@@ -76,6 +75,7 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'threads', '~>0'
   s.add_runtime_dependency 'usagewatch_ext', '~>0'
   s.add_runtime_dependency 'xcop', '~>0'
+  s.add_runtime_dependency 'zache', '~>0'
   s.add_development_dependency 'codecov', '~>0'
   s.add_development_dependency 'minitest', '~>5'
   s.add_development_dependency 'random-port', '~>0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.16.7
+  version: 0.16.8
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -206,20 +206,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: sigdump
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +304,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -482,13 +482,11 @@ files:
 - fixtures/scripts/pull-on-start.sh
 - fixtures/scripts/push-and-pull.sh
 - fixtures/scripts/redeploy-on-upgrade.sh
-- fixtures/scripts/sigdump.sh
 - fixtures/scripts/spread-wallets.sh
 - heroku-run.sh
 - lib/zold.rb
 - lib/zold/age.rb
 - lib/zold/amount.rb
-- lib/zold/cache.rb
 - lib/zold/cached_wallets.rb
 - lib/zold/commands/alias.rb
 - lib/zold/commands/args.rb
@@ -590,7 +588,6 @@ files:
 - test/test__helper.rb
 - test/test_age.rb
 - test/test_amount.rb
-- test/test_cache.rb
 - test/test_cached_wallets.rb
 - test/test_copies.rb
 - test/test_dir_items.rb
@@ -691,7 +688,6 @@ test_files:
 - test/test__helper.rb
 - test/test_age.rb
 - test/test_amount.rb
-- test/test_cache.rb
 - test/test_cached_wallets.rb
 - test/test_copies.rb
 - test/test_dir_items.rb

data/fixtures/scripts/sigdump.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-port=$(reserve_port)
-
-zold node --trace --invoice=NOPREFIX@ffffffffffffffff \
-  --host=localhost --port=${port} --bind-port=${port} \
-  --threads=0 --standalone &
-pid=$!
-trap "halt_nodes ${port}" EXIT
-
-wait_for_port ${port}
-
-kill -CONT ${pid}
-
-wait_for_file sigdump-${pid}.log

data/lib/zold/cache.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2018 Yegor Bugayenko
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the 'Software'), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# Cache.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
-# License:: MIT
-module Zold
-  # Cache
-  class Cache
-    def initialize
-      @hash = {}
-      @mutex = Mutex.new
-    end
-
-    def get(key, lifetime: 60 * 60)
-      @mutex.synchronize do
-        rec = @hash[key]
-        rec = nil if !rec.nil? && rec[:start] < Time.now - rec[:lifetime]
-        if rec.nil?
-          @hash[key] = {
-            value: yield,
-            start: Time.now,
-            lifetime: lifetime
-          }
-        end
-        @hash[key][:value]
-      end
-    end
-  end
-end

data/test/test_cache.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright (c) 2018 Yegor Bugayenko
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the 'Software'), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-require 'minitest/autorun'
-require 'threads'
-require_relative '../lib/zold/cache'
-
-# Cache test.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
-# License:: MIT
-class TestCache < Minitest::Test
-  def test_caches
-    cache = Zold::Cache.new
-    first = cache.get(:hey, lifetime: 5) { Random.rand }
-    second = cache.get(:hey) { Random.rand }
-    assert(first == second)
-  end
-
-  def test_caches_and_expires
-    cache = Zold::Cache.new
-    first = cache.get(:hey, lifetime: 0.01) { Random.rand }
-    sleep 0.1
-    second = cache.get(:hey) { Random.rand }
-    assert(first != second)
-  end
-
-  def test_caches_in_threads
-    cache = Zold::Cache.new
-    Threads.new(10).assert(100) do
-      cache.get(:hey, lifetime: 0.0001) { Random.rand }
-    end
-  end
-end