zold 0.16.6 → 0.16.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7190b0b8462533e8c4bd5f97663d78c7b96a2da53d5676c744f6157f99864d1b
-  data.tar.gz: 1aa4b614367a48e79cf6ad83fab9018910f4ba09813ea5f2a8e463241d3fddf1
+  metadata.gz: a325af91de87bc2bd544f5d92a908eff34f4f114a88fa4cb9248ef286bff9404
+  data.tar.gz: 6e4fd9790fdcf55a23c206e60635c8fe6d45ad83eee4194697989b1f6bf5e51f
 SHA512:
-  metadata.gz: b74b9b9ac60a0abcb280c81eead4ff9b15fa3b139c7973bf80f4f586bbf15feffbf8c085d9b99e8522febb756ab8014702de294e051817a6a41eb274756ac019
-  data.tar.gz: 70f498e4469e72e94d881c7692aa6b7166e76aade1d4b50e60fca1358c859ec65da90af4d57630ef24de009d21eb3540edf5ca1da6694d1a5903480e2e53f1f0
+  metadata.gz: e827fbbefda31c28ad0fe24f23d5694d94997123f5163080a38ca8eee92c2048d4a0245b640896dab6210da8d2f22ac6dc325e3efe962b76cf3a714608534abe
+  data.tar.gz: 41ab159b3f635916fbb289384796e2fe5000aba409e86180248ec2903c684c86bd42642b357dd6e6d34b65b903df6648b4eda4938683cc9850880e3aaac0230a

data/lib/zold/commands/remote.rb

@@ -177,8 +177,8 @@ Available options:"
         return
       end
       unless opts['skip-ping']
-        res = Http.new(uri: "http://#{host}:#{port}/version", score: nil, network: opts['network']).get
-        raise "The node #{host}:#{port} is not responding (code is #{res.code})" unless res.code == '200'
+        res = Http.new(uri: "http://#{host}:#{port}/version", network: opts['network']).get
+        raise "The node #{host}:#{port} is not responding, #{res.code}:#{res.message}" unless res.code == '200'
       end
       @remotes.add(host, port)
       @log.info("#{host}:#{port} added to the list, #{@remotes.all.count} total")

data/lib/zold/commands/taxes.rb

@@ -115,7 +115,8 @@ Available options:"
       raise 'The wallet is absent' unless wallet.exists?
       tax = Tax.new(wallet)
       debt = tax.debt
-      @log.info("The current debt of #{wallet.id}/#{wallet.txns.count}t is #{debt} (#{debt.to_i} zents)")
+      @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
@@ -160,7 +161,7 @@ Available options:"
         r.assert_valid_score(score)
         r.assert_score_strength(score) unless opts['ignore-score-weakness']
         r.assert_score_value(score, Tax::EXACT_SCORE)
-        @log.info("#{r}: #{Rainbow(score.value).green}")
+        @log.info("#{r}: #{Rainbow(score.value).green} to #{score.invoice}")
         best << score
       end
       best.sort_by(&:value).reverse

data/lib/zold/http.rb

@@ -26,7 +26,7 @@ require 'timeout'
 require 'net/http'
 require 'backtrace'
 require_relative 'version'
-require_relative 'type'
+require_relative 'score'
 
 # HTTP page.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -34,7 +34,7 @@ require_relative 'type'
 # License:: MIT
 module Zold
   # Http page
-  class Http < Dry::Struct
+  class Http
     # HTTP header we add to each HTTP request, in order to inform
     # the other node about the score. If the score is big enough,
     # the remote node will add us to its list of remote nodes.
@@ -60,23 +60,19 @@ module Zold
     # Connect timeout in seconds
     CONNECT_TIMEOUT = 4
 
-    # @todo #98:30m/DEV The following two statements are seen as issues by rubocop
-    #  raising a Lint/AmbiguousBlockAssociation offense. It is somthing
-    #  that could be solved by changing the TargetRubyVersion in .rubocop.yml
-    #  that is already taken care of in another issue. I am leaving a todo
-    #  to check that rubocop doesn't complain anymore, otherwise find another
-    #  solution
-    attribute :uri, (Types::Class.constructor { |v| v.is_a?(URI) ? v : URI(v) })
-    attribute :score, (Types::Class.constructor { |v| v.nil? ? Score::ZERO : v })
-    attribute :network, Types::Strict::String.optional.default('test')
+    def initialize(uri:, score: Score::ZERO, network: 'test')
+      @uri = uri.is_a?(URI) ? uri : URI(uri)
+      @score = score
+      @network = network
+    end
 
     def get
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = uri.scheme == 'https'
+      http = Net::HTTP.new(@uri.host, @uri.port)
+      http.use_ssl = @uri.scheme == 'https'
       http.read_timeout = Http::READ_TIMEOUT
       http.open_timeout = Http::CONNECT_TIMEOUT
-      path = uri.path
-      path += '?' + uri.query if uri.query
+      path = @uri.path
+      path += '?' + @uri.query if @uri.query
       Timeout.timeout(Http::READ_TIMEOUT + Http::CONNECT_TIMEOUT) do
         http.request_get(path, headers)
       end
@@ -85,12 +81,12 @@ module Zold
     end
 
     def put(body)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = uri.scheme == 'https'
+      http = Net::HTTP.new(@uri.host, @uri.port)
+      http.use_ssl = @uri.scheme == 'https'
       http.read_timeout = Http::READ_TIMEOUT
       http.open_timeout = Http::CONNECT_TIMEOUT
-      path = uri.path
-      path += '?' + uri.query if uri.query
+      path = @uri.path
+      path += '?' + @uri.query if @uri.query
       Timeout.timeout(Http::READ_TIMEOUT + Http::CONNECT_TIMEOUT) do
         http.request_put(
           path, body,
@@ -141,8 +137,8 @@ module Zold
       }
       headers[Http::VERSION_HEADER] = Zold::VERSION
       headers[Http::PROTOCOL_HEADER] = Zold::PROTOCOL.to_s
-      headers[Http::NETWORK_HEADER] = network
-      headers[Http::SCORE_HEADER] = score.reduced(4).to_text if score.valid? && !score.expired? && score.value > 3
+      headers[Http::NETWORK_HEADER] = @network
+      headers[Http::SCORE_HEADER] = @score.reduced(4).to_text if @score.valid? && !@score.expired? && @score.value > 3
       headers
     end
   end

data/lib/zold/node/front.rb

@@ -100,9 +100,7 @@ while #{settings.address} is in '#{settings.network}'")
         end
       end
       check_header(Http::SCORE_HEADER) do |header|
-        if settings.remotes.all.empty?
-          settings.log.debug("#{request.url}: we are in standalone mode, won't update remotes")
-        end
+        settings.log.debug("#{request.url}: we are in standalone mode, won't update remotes") if all_remotes.empty?
         s = Score.parse_text(header)
         error(400, 'The score is invalid') unless s.valid?
         error(400, 'The score is weak') if s.strength < Score::STRENGTH && !settings.ignore_score_weakness
@@ -195,8 +193,8 @@ in #{Age.new(@start, limit: 1)}")
         load: settings.cache.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: settings.remotes.all.count,
-        nscore: settings.remotes.all.map { |r| r[:score] }.inject(&:+) || 0,
+        remotes: all_remotes.count,
+        nscore: all_remotes.map { |r| r[:score] }.inject(&:+) || 0,
         farm: settings.farm.to_json,
         entrance: settings.entrance.to_json,
         date: Time.now.utc.iso8601,
@@ -368,7 +366,7 @@ in #{Age.new(@start, limit: 1)}")
         version: settings.version,
         alias: settings.node_alias,
         score: score.to_h,
-        all: settings.remotes.all,
+        all: all_remotes,
         mtime: settings.remotes.mtime.utc.iso8601
       )
     end
@@ -436,8 +434,14 @@ in #{Age.new(@start, limit: 1)}")
       settings.wallets.all.count
     end
 
+    def all_remotes
+      settings.cache.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 : 1) do
+      settings.cache.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/remotes.rb

@@ -32,7 +32,6 @@ require_relative 'age'
 require_relative 'score'
 require_relative 'http'
 require_relative 'node/farm'
-require_relative 'type'
 
 # The list of remotes.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -40,7 +39,7 @@ require_relative 'type'
 # License:: MIT
 module Zold
   # All remotes
-  class Remotes < Dry::Struct
+  class Remotes
     # The default TCP port all nodes are supposed to use.
     PORT = 4096
 
@@ -50,9 +49,8 @@ module Zold
     # Default number of nodes to fetch.
     MAX_NODES = 16
 
-    attribute :file, Types::Strict::String
-    attribute :network, Types::Strict::String.optional.default('test')
-    attribute :timeout, Types::Strict::Integer.optional.default(16)
+    # Default nodes and their ports
+    DEFS = CSV.read(File.expand_path(File.join(File.dirname(__FILE__), '../../resources/remotes')))
 
     # Empty, for standalone mode
     class Empty
@@ -74,22 +72,22 @@ module Zold
     end
 
     # One remote.
-    class Remote < Dry::Struct
-      attribute :host, Types::Strict::String
-      attribute :port, Types::Strict::Integer.constrained(gteq: 0, lt: 65_535)
-      attribute :score, Score
-      attribute :idx, Types::Strict::Integer
-      attribute :network, Types::Strict::String.optional.default('test')
-      attribute :log, (Types::Class.constructor do |value|
-        value.nil? ? Log::Quiet.new : value
-      end)
+    class Remote
+      def initialize(host:, port:, score:, idx:, network: 'test', log: Log::Quiet.new)
+        @host = host
+        @port = port
+        @score = score
+        @idx = idx
+        @network = network
+        @log = log
+      end
 
       def http(path = '/')
-        Http.new(uri: "http://#{host}:#{port}#{path}", score: score, network: network)
+        Http.new(uri: "http://#{@host}:#{@port}#{path}", score: @score, network: @network)
       end
 
       def to_s
-        "#{host}:#{port}/#{idx}"
+        "#{@host}:#{@port}/#{@idx}"
       end
 
       def assert_code(code, response)
@@ -108,8 +106,8 @@ module Zold
       end
 
       def assert_score_ownership(score)
-        raise "Masqueraded host #{host} as #{score.host}: #{score}" if host != score.host
-        raise "Masqueraded port #{port} as #{score.port}: #{score}" if port != score.port
+        raise "Masqueraded host #{@host} as #{score.host}: #{score}" if @host != score.host
+        raise "Masqueraded port #{@port} as #{score.port}: #{score}" if @port != score.port
       end
 
       def assert_score_strength(score)
@@ -121,6 +119,12 @@ module Zold
       end
     end
 
+    def initialize(file:, network: 'test', timeout: 16)
+      @file = file
+      @network = network
+      @timeout = timeout
+    end
+
     def all
       list = load
       max_score = list.map { |r| r[:score] }.max || 0
@@ -137,9 +141,8 @@ module Zold
     end
 
     def defaults
-      other = Remotes.new(file: File.expand_path(File.join(File.dirname(__FILE__), '../../resources/remotes')))
-      other.all.each do |r|
-        add(r[:host], r[:port])
+      Remotes::DEFS.each do |r|
+        add(r[0], r[1].to_i)
       end
     end
 
@@ -194,12 +197,12 @@ module Zold
               score: score,
               idx: idx,
               log: log,
-              network: network
+              network: @network
             )
-            raise 'Took too long to execute' if (Time.now - start).round > timeout
+            raise 'Took too long to execute' if (Time.now - start).round > @timeout
           rescue StandardError => e
             error(r[:host], r[:port])
-            log.info("#{Rainbow("#{r[:host]}:#{r[:port]}").red}: #{e.message} in #{Age.new(start)}")
+            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
           end
@@ -226,13 +229,17 @@ module Zold
     end
 
     def mtime
-      File.exist?(file) ? File.mtime(file) : Time.now
+      File.exist?(@file) ? File.mtime(@file) : Time.now
+    end
+
+    def default?(host, port)
+      !Remotes::DEFS.find { |r| r[0] == host && r[1].to_i == port }.nil?
     end
 
     private
 
     def modify
-      Futex.new(file).open do
+      Futex.new(@file).open do
         save(yield(load))
       end
     end
@@ -247,13 +254,14 @@ module Zold
     end
 
     def load
-      if File.exist?(file)
-        raw = CSV.read(file).map do |row|
+      if File.exist?(@file)
+        raw = CSV.read(@file).map do |row|
           {
             host: row[0],
             port: row[1].to_i,
             score: row[2].to_i,
-            errors: row[3].to_i
+            errors: row[3].to_i,
+            default: default?(row[0], row[1].to_i)
           }
         end
         raw.reject { |r| !r[:host] || r[:port].zero? }.map do |r|
@@ -266,9 +274,9 @@ module Zold
     end
 
     def save(list)
-      FileUtils.mkdir_p(File.dirname(file))
+      FileUtils.mkdir_p(File.dirname(@file))
       IO.write(
-        file,
+        @file,
         list.uniq { |r| "#{r[:host]}:#{r[:port]}" }.map do |r|
           [
             r[:host],

data/lib/zold/score.rb

@@ -22,7 +22,6 @@
 
 require 'openssl'
 require 'time'
-require_relative 'type'
 
 # The score.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -30,21 +29,22 @@ require_relative 'type'
 # License:: MIT
 module Zold
   # Score
-  class Score < Dry::Struct
+  class Score
     # Default strength for the entire system, in production mode.
     STRENGTH = 6
 
-    attribute :time, Types::Strict::Time.optional.default(Time.now)
-    attribute :host, Types::Strict::String.constrained(
-      format: /^[a-z0-9\.-]+$/
-    )
-    attribute :port, Types::Strict::Integer.constrained(gteq: 0, lt: 65_535)
-    attribute :invoice, Types::Strict::String.constrained(
-      format: /^[a-zA-Z0-9]{8,32}@[a-f0-9]{16}$/
-    )
-    attribute :suffixes, Types::Strict::Array.optional.default([])
-    attribute :strength, Types::Strict::Integer.optional.default(STRENGTH)
-    attribute :created, Types::Strict::Time.optional.default(Time.now)
+    attr_reader :time, :host, :port, :invoice, :suffixes, :strength, :created
+
+    def initialize(time: Time.now, host:, port:, invoice:, suffixes: [],
+      strength: Score::STRENGTH, created: Time.now)
+      @time = time
+      @host = host
+      @port = port
+      @invoice = invoice
+      @suffixes = suffixes
+      @strength = strength
+      @created = created
+    end
 
     # The default no-value score.
     ZERO = Score.new(time: Time.now, host: 'localhost', port: 80, invoice: 'NOPREFIX@ffffffffffffffff')
@@ -96,61 +96,62 @@ module Zold
     end
 
     def hash
-      raise 'Score has zero value, there is no hash' if suffixes.empty?
-      suffixes.reduce(prefix) do |pfx, suffix|
+      raise 'Score has zero value, there is no hash' if @suffixes.empty?
+      @suffixes.reduce(prefix) do |pfx, suffix|
         OpenSSL::Digest::SHA256.new("#{pfx} #{suffix}").hexdigest
       end
     end
 
     def to_mnemo
-      "#{value}:#{time.strftime('%H%M')}"
+      "#{value}:#{@time.strftime('%H%M')}"
     end
 
     def to_text
-      pfx, bnf = invoice.split('@')
+      pfx, bnf = @invoice.split('@')
       [
-        strength,
-        time.to_i.to_s(16),
-        host,
-        port.to_s(16),
+        @strength,
+        @time.to_i.to_s(16),
+        @host,
+        @port.to_s(16),
         pfx,
         bnf,
-        suffixes.join(' ')
+        @suffixes.join(' ')
       ].join(' ')
     end
 
     def to_s
       [
-        "#{value}/#{strength}:",
-        time.utc.iso8601,
-        host,
-        port,
-        invoice,
-        suffixes.join(' ')
+        "#{value}/#{@strength}:",
+        @time.utc.iso8601,
+        @host,
+        @port,
+        @invoice,
+        @suffixes.join(' ')
       ].join(' ').strip
     end
 
     def to_h
       {
         value: value,
-        host: host,
-        port: port,
-        invoice: invoice,
-        time: time.utc.iso8601,
-        suffixes: suffixes,
-        strength: strength,
+        host: @host,
+        port: @port,
+        invoice: @invoice,
+        time: @time.utc.iso8601,
+        suffixes: @suffixes,
+        strength: @strength,
         hash: value.zero? ? nil : hash,
         expired: expired?,
         valid: valid?,
         age: (age / 60).round,
-        created: created.utc.iso8601
+        created: @created.utc.iso8601
       }
     end
 
     def reduced(max = 4)
       Score.new(
-        time: time, host: host, port: port, invoice: invoice,
-        suffixes: suffixes[0..[max, suffixes.count].min - 1], strength: strength, created: nil
+        time: @time, host: @host, port: @port, invoice: @invoice,
+        suffixes: @suffixes[0..[max, suffixes.count].min - 1],
+        strength: @strength
       )
     end
 
@@ -160,14 +161,15 @@ module Zold
       loop do
         suffix = idx.to_s(16)
         score = Score.new(
-          time: time, host: host, port: port, invoice: invoice, suffixes: suffixes + [suffix],
-          strength: strength
+          time: @time, host: @host, port: @port,
+          invoice: @invoice, suffixes: @suffixes + [suffix],
+          strength: @strength
         )
         return score if score.valid?
         if score.expired?
           return Score.new(
-            time: Time.now, host: host, port: port, invoice: invoice,
-            suffixes: [], strength: strength
+            time: Time.now, host: @host, port: @port, invoice: @invoice,
+            suffixes: [], strength: @strength
           )
         end
         idx += 1
@@ -175,7 +177,7 @@ module Zold
     end
 
     def age
-      Time.now - time
+      Time.now - @time
     end
 
     def expired?(hours = 24)
@@ -183,15 +185,15 @@ module Zold
     end
 
     def prefix
-      "#{time.utc.iso8601} #{host} #{port} #{invoice}"
+      "#{@time.utc.iso8601} #{@host} #{@port} #{@invoice}"
     end
 
     def valid?
-      suffixes.empty? || hash.end_with?('0' * strength)
+      @suffixes.empty? || hash.end_with?('0' * @strength)
     end
 
     def value
-      suffixes.length
+      @suffixes.length
     end
 
     def zero?

data/lib/zold/tax.rb

@@ -40,7 +40,7 @@ module Zold
     # The correct amount should be 1 ZLD, but we allow bigger amounts
     # now since the amount of nodes in the network is still small. When
     # the network grows up, let's put this number back to 1 ZLD.
-    MAX_PAYMENT = Amount.new(zld: 16.0)
+    MAX_PAYMENT = Amount.new(zld: 64.0)
 
     # This is how much we charge per one transaction per hour
     # of storage. A wallet of 4096 transactions will pay
@@ -76,6 +76,10 @@ module Zold
       debt > Tax::TRIAL
     end
 
+    def to_text
+      "A=#{@wallet.age}, F=#{Tax::FEE_TXN_HOUR}, T=#{@wallet.txns.count}"
+    end
+
     def debt
       txns = @wallet.txns
       scored = txns.map do |t|

data/lib/zold/version.rb

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

data/resources/remotes

@@ -1,6 +1,6 @@
-b1.zold.io,80,0,0
-b2.zold.io,4096,0,0
-159.203.63.90,4096,0,0
-167.99.77.100,4096,0,0
-159.203.19.189,4096,0,0
-138.197.140.42,4096,0,0
+b1.zold.io,80
+b2.zold.io,4096
+159.203.63.90,4096
+167.99.77.100,4096
+159.203.19.189,4096
+138.197.140.42,4096

data/test/node/fake_node.rb

@@ -64,7 +64,7 @@ class FakeNode
         end
         uri = "http://localhost:#{port}/"
         loop do
-          ping = Zold::Http.new(uri: uri, score: nil, network: Zold::Front.network).get
+          ping = Zold::Http.new(uri: uri, network: Zold::Front.network).get
           break unless ping.code == '599' && node.alive?
           @log.debug("Waiting for #{uri}: ##{ping.code}...")
           sleep 0.5

data/test/node/test_front.rb

@@ -40,7 +40,7 @@ class FrontTest < Minitest::Test
 
   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', score: nil).get
+      res = Zold::Http.new(uri: "http://localhost:#{port}/", network: 'foo').get
       json = JSON.parse(res.body)
       assert_equal(Zold::VERSION, json['version'])
       assert_equal(Zold::PROTOCOL, json['protocol'])
@@ -83,7 +83,7 @@ class FrontTest < Minitest::Test
       }.each do |code, paths|
         paths.each do |p|
           uri = URI("http://localhost:#{port}#{p}")
-          response = Zold::Http.new(uri: uri, score: nil).get
+          response = Zold::Http.new(uri: uri).get
           assert_equal(
             code, response.code,
             "Invalid response code for #{uri}: #{response.message}"
@@ -113,7 +113,7 @@ class FrontTest < Minitest::Test
     FakeNode.new(log: test_log).run(['--threads=1', '--strength=1', '--no-metronome']) do |port|
       3.times do |i|
         assert_equal_wait(true) do
-          response = Zold::Http.new(uri: "http://localhost:#{port}/", score: nil).get
+          response = Zold::Http.new(uri: "http://localhost:#{port}/").get
           assert_equal('200', response.code, response.body)
           score = Zold::Score.parse_json(Zold::JsonPage.new(response.body).to_hash['score'])
           score.value >= i
@@ -127,10 +127,10 @@ class FrontTest < Minitest::Test
       FakeNode.new(log: test_log).run(['--ignore-score-weakness', '--standalone']) do |port|
         wallet = home.create_wallet
         base = "http://localhost:#{port}"
-        response = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil)
+        response = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}")
           .put(IO.read(wallet.path))
         assert_equal('200', response.code, response.body)
-        assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).get.code }
+        assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.code }
         [
           "/wallet/#{wallet.id}.txt",
           "/wallet/#{wallet.id}.json",
@@ -141,7 +141,7 @@ class FrontTest < Minitest::Test
           "/wallet/#{wallet.id}.bin",
           "/wallet/#{wallet.id}/copies"
         ].each do |u|
-          assert_equal_wait('200') { Zold::Http.new(uri: "#{base}#{u}", score: nil).get.code }
+          assert_equal_wait('200') { Zold::Http.new(uri: "#{base}#{u}").get.code }
         end
       end
     end
@@ -152,13 +152,13 @@ class FrontTest < Minitest::Test
       FakeHome.new(log: test_log).run do |home|
         wallet = home.create_wallet
         base = "http://localhost:#{port}"
-        Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).put(IO.read(wallet.path))
-        assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).get.code }
+        Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").put(IO.read(wallet.path))
+        assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.code }
         threads = []
         mutex = Mutex.new
         Threads.new(6).assert(100) do
           assert_equal_wait('200') do
-            res = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).get
+            res = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get
             mutex.synchronize { threads << res.header['X-Zold-Thread'] }
             res.code
           end
@@ -175,11 +175,11 @@ class FrontTest < Minitest::Test
         base = "http://localhost:#{port}"
         assert_equal(
           '200',
-          Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).put(IO.read(wallet.path)).code
+          Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").put(IO.read(wallet.path)).code
         )
-        assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).get.code }
+        assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.code }
         3.times do
-          r = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil)
+          r = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}")
             .put(IO.read(wallet.path))
           assert_equal('304', r.code, r.body)
         end
@@ -193,8 +193,8 @@ class FrontTest < Minitest::Test
       FakeHome.new(log: test_log).run do |home|
         Threads.new(5).assert do
           wallet = home.create_wallet
-          Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).put(IO.read(wallet.path))
-          assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).get.code }
+          Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").put(IO.read(wallet.path))
+          assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.code }
         end
       end
     end
@@ -235,7 +235,7 @@ class FrontTest < Minitest::Test
 
   def test_gzip
     FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
-      response = Zold::Http.new(uri: URI("http://localhost:#{port}/"), score: nil).get
+      response = Zold::Http.new(uri: URI("http://localhost:#{port}/")).get
       assert_equal(
         '200', response.code,
         "Expected HTTP 200 OK: Found #{response.code}"
@@ -252,7 +252,7 @@ class FrontTest < Minitest::Test
     FakeNode.new(log: test_log).run(['--threads=4', '--strength=6', '--no-metronome', '--farmer=ruby-proc']) do |port|
       Threads.new(10).assert(100) do
         start = Time.now
-        Zold::Http.new(uri: URI("http://localhost:#{port}/"), score: nil).get
+        Zold::Http.new(uri: URI("http://localhost:#{port}/")).get
         times << Time.now - start
       end
     end
@@ -264,7 +264,7 @@ class FrontTest < Minitest::Test
   def test_headers_are_being_set_correctly
     Time.stub :now, Time.at(0) do
       FakeNode.new(log: test_log).run(['--no-metronome', '--threads=0', '--ignore-score-weakness']) do |port|
-        response = Zold::Http.new(uri: URI("http://localhost:#{port}/"), score: nil).get
+        response = Zold::Http.new(uri: URI("http://localhost:#{port}/")).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'])
@@ -284,7 +284,7 @@ class FrontTest < Minitest::Test
         '/remotes'
       ].each do |path|
         uri = URI("http://localhost:#{port}#{path}")
-        response = Zold::Http.new(uri: uri, score: nil).get
+        response = Zold::Http.new(uri: uri).get
         assert_match(
           name,
           Zold::JsonPage.new(response.body).to_hash['alias'].to_s,
@@ -297,7 +297,7 @@ class FrontTest < Minitest::Test
   def test_default_alias_parameter
     FakeNode.new(log: test_log).run(['--ignore-score-weakness', '--no-metronome']) do |port|
       uri = URI("http://localhost:#{port}/")
-      response = Zold::Http.new(uri: uri, score: nil).get
+      response = Zold::Http.new(uri: uri).get
       assert_match(
         "localhost:#{port}",
         Zold::JsonPage.new(response.body).to_hash['alias'].to_s,
@@ -310,7 +310,7 @@ class FrontTest < Minitest::Test
     exception = assert_raises RuntimeError do
       FakeNode.new(log: test_log).run(['--ignore-score-weakness', '--alias=invalid-alias']) do |port|
         uri = URI("http://localhost:#{port}/")
-        Zold::Http.new(uri: uri, score: nil).get
+        Zold::Http.new(uri: uri).get
       end
     end
     assert(exception.message.include?('should be a 4 to 16 char long'), exception.message)
@@ -322,16 +322,16 @@ class FrontTest < Minitest::Test
       FakeHome.new(log: test_log).run do |home|
         wallet = home.create_wallet(Zold::Id::ROOT)
         base = "http://localhost:#{port}"
-        Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).put(IO.read(wallet.path))
-        assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).get.code }
+        Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").put(IO.read(wallet.path))
+        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)
-          Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).put(IO.read(wallet.path))
-          assert_equal('200', Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}", score: nil).get.code)
+          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
         assert_equal_wait(-10 * cycles) do
-          Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}/balance", score: nil).get.body.to_i
+          Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}/balance").get.body.to_i
         end
       end
     end

data/test/test_http.rb

@@ -34,14 +34,14 @@ require_relative '../lib/zold/score'
 class TestHttp < Minitest::Test
   def test_pings_broken_uri
     stub_request(:get, 'http://bad-host/').to_return(status: 500)
-    res = Zold::Http.new(uri: 'http://bad-host/', score: nil).get
+    res = Zold::Http.new(uri: 'http://bad-host/').get
     assert_equal('500', res.code)
     assert_equal('', res.body)
   end
 
   def test_pings_with_exception
     stub_request(:get, 'http://exception/').to_return { raise 'Intentionally' }
-    res = Zold::Http.new(uri: 'http://exception/', score: nil).get
+    res = Zold::Http.new(uri: 'http://exception/').get
     assert_equal('599', res.code)
     assert(res.body.include?('Intentionally'))
     assert(!res.header['nothing'])
@@ -49,7 +49,7 @@ class TestHttp < Minitest::Test
 
   def test_pings_live_uri
     stub_request(:get, 'http://good-host/').to_return(status: 200)
-    res = Zold::Http.new(uri: 'http://good-host/', score: nil).get
+    res = Zold::Http.new(uri: 'http://good-host/').get
     assert_equal('200', res.code)
   end
 
@@ -57,7 +57,7 @@ class TestHttp < Minitest::Test
     stub_request(:get, 'http://some-host-1/')
       .with(headers: { 'X-Zold-Network' => 'xyz' })
       .to_return(status: 200)
-    res = Zold::Http.new(uri: 'http://some-host-1/', score: nil, network: 'xyz').get
+    res = Zold::Http.new(uri: 'http://some-host-1/', network: 'xyz').get
     assert_equal('200', res.code)
   end
 
@@ -65,7 +65,7 @@ class TestHttp < Minitest::Test
     stub_request(:get, 'http://some-host-2/')
       .with(headers: { 'X-Zold-Protocol' => Zold::PROTOCOL })
       .to_return(status: 200)
-    res = Zold::Http.new(uri: 'http://some-host-2/', score: nil).get
+    res = Zold::Http.new(uri: 'http://some-host-2/').get
     assert_equal('200', res.code)
   end
 
@@ -74,7 +74,7 @@ class TestHttp < Minitest::Test
       sleep 100
       { body: 'This should never be returned!' }
     end
-    res = Zold::Http.new(uri: 'http://the-fake-host-99/', score: nil).get
+    res = Zold::Http.new(uri: 'http://the-fake-host-99/').get
     assert_equal('599', res.code)
   end
 
@@ -82,7 +82,7 @@ class TestHttp < Minitest::Test
     stub_request(:get, 'http://some-host-3/')
       .with(headers: { 'X-Zold-Version' => Zold::VERSION })
       .to_return(status: 200)
-    res = Zold::Http.new(uri: 'http://some-host-3/', score: nil).get
-    assert_equal('200', res.code)
+    res = Zold::Http.new(uri: 'http://some-host-3/').get
+    assert_equal('200', res.code, res)
   end
 end

data/test/test_remotes.rb

@@ -45,6 +45,15 @@ class TestRemotes < Minitest::Test
     end
   end
 
+  def test_finds_defaults
+    Dir.mktmpdir do |dir|
+      file = File.join(dir, 'remotes')
+      FileUtils.touch(file)
+      remotes = Zold::Remotes.new(file: file)
+      assert(remotes.default?('b1.zold.io', 80))
+    end
+  end
+
   def test_reads_broken_file
     Dir.mktmpdir do |dir|
       file = File.join(dir, 'remotes')

data/test/test_tax.rb

@@ -82,6 +82,14 @@ class TestTax < Minitest::Test
     end
   end
 
+  def test_prints_tax_formula
+    FakeHome.new(log: test_log).run do |home|
+      wallet = home.create_wallet
+      tax = Zold::Tax.new(wallet)
+      assert(!tax.to_text.nil?)
+    end
+  end
+
   def test_takes_tax_payment_into_account
     FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet

data/zold.gemspec

@@ -58,8 +58,6 @@ and suggests a different architecture for digital wallet maintenance.'
   s.add_runtime_dependency 'concurrent-ruby', '~>1.0'
   s.add_runtime_dependency 'cucumber', '~>3' # has to stay here for Heroku
   s.add_runtime_dependency 'diffy', '~>3'
-  s.add_runtime_dependency 'dry-struct', '~>0'
-  s.add_runtime_dependency 'dry-types', '~>0'
   s.add_runtime_dependency 'futex', '~>0'
   s.add_runtime_dependency 'get_process_mem', '~>0'
   s.add_runtime_dependency 'json', '~>2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.16.6
+  version: 0.16.7
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -66,34 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: dry-struct
-  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: dry-types
-  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: futex
   requirement: !ruby/object:Gem::Requirement
@@ -574,7 +546,6 @@ files:
 - lib/zold/tree_wallets.rb
 - lib/zold/txn.rb
 - lib/zold/txns.rb
-- lib/zold/type.rb
 - lib/zold/upgrades.rb
 - lib/zold/verbose_thread.rb
 - lib/zold/version.rb

data/lib/zold/type.rb

@@ -1,37 +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.
-
-# @todo #394:30m/DEV Right now only Score, Http, Zold::Remotes and Zold::Remote
-#  classes have been refactored for using dry-types, even tough the issue has
-#  been boosted refactoring the whole project is very cumbersome. Please refer
-#  to Score and Http class on how to perform all the changes for the project to
-#  adopt dry-types
-require 'dry-types'
-require 'dry-struct'
-
-# HTTP page.
-# Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Yegor Bugayenko
-# License:: MIT
-module Types
-  include Dry::Types.module
-end