zold 0.14.17 → 0.14.18

data/lib/zold/node/spread_entrance.rb

@@ -68,7 +68,6 @@ module Zold
         @modified = Queue.new
         @push = Thread.start do
           Thread.current.abort_on_exception = true
-          Thread.current.priority = -100
           Thread.current.name = 'push'
           VerboseThread.new(@log).run(true) do
             loop do

data/lib/zold/remotes.rb

@@ -28,6 +28,7 @@ require 'fileutils'
 require_relative 'backtrace'
 require_relative 'node/farm'
 require_relative 'atomic_file'
+require_relative 'type'
 
 # The list of remotes.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -42,18 +43,11 @@ module Zold
     # At what amount of errors we delete the remote automatically
     TOLERANCE = 8
 
-    # After this limit, the remote runtime must be recorded
-    RUNTIME_LIMIT = 16
-
     # Default number of nodes to fetch.
     MAX_NODES = 16
 
     # Empty, for standalone mode
     class Empty < Remotes
-      def initialize
-        # Nothing here
-      end
-
       def all
         []
       end
@@ -64,33 +58,28 @@ module Zold
     end
 
     # One remote.
-    class Remote
-      attr_reader :host, :port
-      def initialize(host, port, score, idx, log: Log::Quiet.new, network: 'test')
-        @host = host
-        raise 'Post must be Integer' unless port.is_a?(Integer)
-        @port = port
-        raise 'Score must be of type Score' unless score.is_a?(Score)
-        @score = score
-        raise 'Idx must be of type Integer' unless idx.is_a?(Integer)
-        @idx = idx
-        raise 'Network can\'t be nil' if network.nil?
-        @network = network
-        @log = log
-      end
+    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)
 
       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)
         msg = response.message.strip
         return if response.code.to_i == code
-        @log.debug("#{response.code} \"#{response.message}\" at \"#{response.body}\"")
+        log.debug("#{response.code} \"#{response.message}\" at \"#{response.body}\"")
         raise "Unexpected HTTP code #{response.code}, instead of #{code}" if msg.empty?
         raise "#{msg} (HTTP code #{response.code}, instead of #{code})"
       end
@@ -101,8 +90,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)
@@ -114,12 +103,11 @@ module Zold
       end
     end
 
-    def initialize(file, network: 'test')
-      raise 'File can\'t be nil' if file.nil?
+    def initialize(file:, network: 'test', mutex: Mutex.new, timeout: 16)
       @file = file
-      raise 'Network can\'t be nil' if network.nil?
       @network = network
-      @mutex = Mutex.new
+      @mutex = mutex
+      @timeout = timeout
     end
 
     def all
@@ -134,7 +122,7 @@ module Zold
     end
 
     def clean
-      save([])
+      modify { [] }
     end
 
     def reset
@@ -161,18 +149,18 @@ module Zold
       raise 'Port can\'t be negative' if port.negative?
       raise 'Port can\'t be over 65536' if port > 0xffff
       raise "#{host}:#{port} already exists" if exists?(host, port)
-      list = load
-      list << { host: host.downcase, port: port, score: 0 }
-      save(list)
+      modify do |list|
+        list + [{ host: host.downcase, port: port, score: 0 }]
+      end
     end
 
     def remove(host, port = Remotes::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?
-      list = load
-      list.reject! { |r| r[:host] == host.downcase && r[:port] == port }
-      save(list)
+      modify do |list|
+        list.reject { |r| r[:host] == host.downcase && r[:port] == port }
+      end
     end
 
     def iterate(log, farm: Farm::Empty.new)
@@ -188,12 +176,18 @@ module Zold
         pool.post do
           Thread.current.abort_on_exception = true
           Thread.current.name = 'remotes'
-          Thread.current.priority = -100
           start = Time.now
           begin
-            yield Remotes::Remote.new(r[:host], r[:port], score, idx, log: log, network: @network)
+            yield Remotes::Remote.new(
+              host: r[:host],
+              port: r[:port],
+              score: score,
+              idx: idx,
+              log: log,
+              network: @network
+            )
             idx += 1
-            raise 'Took too long to execute' if (Time.now - start).round > Remotes::RUNTIME_LIMIT
+            raise 'Took too long to execute' if (Time.now - start).round > @timeout
           rescue StandardError => e
             error(r[:host], r[:port])
             errors = errors(r[:host], r[:port])
@@ -234,49 +228,48 @@ in #{(Time.now - start).round}s; errors=#{errors}")
 
     private
 
-    def if_present(host, port)
-      list = load
-      remote = list.find { |r| r[:host] == host.downcase && r[:port] == port }
-      return unless remote
-      yield remote
-      save(list)
-    end
-
-    def load
+    def modify
       @mutex.synchronize do
-        raw = CSV.read(file).map do |r|
-          {
-            host: r[0],
-            port: r[1].to_i,
-            score: r[2].to_i,
-            errors: r[3].to_i
-          }
-        end
-        raw.reject { |r| !r[:host] || r[:port].zero? }.map do |r|
-          r[:home] = URI("http://#{r[:host]}:#{r[:port]}/")
-          r
-        end
+        save(yield(load))
       end
     end
 
-    def save(list)
-      @mutex.synchronize do
-        AtomicFile.new(file).write(
-          list.uniq { |r| "#{r[:host]}:#{r[:port]}" }.map do |r|
-            [
-              r[:host],
-              r[:port],
-              r[:score],
-              r[:errors]
-            ].join(',')
-          end.join("\n")
-        )
+    def if_present(host, port)
+      modify do |list|
+        remote = list.find { |r| r[:host] == host.downcase && r[:port] == port }
+        return unless remote
+        yield remote
+        list
       end
     end
 
-    def file
+    def load
       reset unless File.exist?(@file)
-      @file
+      raw = CSV.read(@file).map do |r|
+        {
+          host: r[0],
+          port: r[1].to_i,
+          score: r[2].to_i,
+          errors: r[3].to_i
+        }
+      end
+      raw.reject { |r| !r[:host] || r[:port].zero? }.map do |r|
+        r[:home] = URI("http://#{r[:host]}:#{r[:port]}/")
+        r
+      end
+    end
+
+    def save(list)
+      AtomicFile.new(@file).write(
+        list.uniq { |r| "#{r[:host]}:#{r[:port]}" }.map do |r|
+          [
+            r[:host],
+            r[:port],
+            r[:score],
+            r[:errors]
+          ].join(',')
+        end.join("\n")
+      )
     end
   end
 end

data/lib/zold/type.rb

@@ -20,10 +20,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-# @todo #98:30m/DEV Right now only Score and Http 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
+# @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'
 

data/lib/zold/version.rb

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

data/test/commands/routines/test_reconnect.rb

@@ -33,8 +33,8 @@ require_relative '../../../lib/zold/commands/routines/reconnect.rb'
 # License:: MIT
 class TestReconnect < Minitest::Test
   def test_reconnects
-    Dir.mktmpdir 'test' do |dir|
-      remotes = Zold::Remotes.new(File.join(dir, 'remotes.csv'))
+    Dir.mktmpdir do |dir|
+      remotes = Zold::Remotes.new(file: File.join(dir, 'remotes.csv'))
       remotes.clean
       stub_request(:get, 'http://b1.zold.io:80/remotes').to_return(status: 404)
       opts = { 'never-reboot' => true, 'routine-immediately' => true }

data/test/commands/test_create.rb

@@ -33,7 +33,7 @@ require_relative '../../lib/zold/commands/create'
 # License:: MIT
 class TestCreate < Minitest::Test
   def test_creates_wallet
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       wallet = Zold::Create.new(wallets: Zold::Wallets.new(dir), log: test_log).run(
         ['create', '--public-key=fixtures/id_rsa.pub']
       )

data/test/commands/test_invoice.rb

@@ -35,7 +35,7 @@ require_relative '../../lib/zold/commands/invoice'
 # License:: MIT
 class TestInvoice < Minitest::Test
   def test_generates_invoice
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       id = Zold::Id.new
       wallets = Zold::Wallets.new(dir)
       source = wallets.find(id)

data/test/commands/test_list.rb

@@ -34,7 +34,7 @@ require_relative '../../lib/zold/commands/list'
 # License:: MIT
 class TestList < Minitest::Test
   def test_lists_wallets_with_balances
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       id = Zold::Id.new
       wallets = Zold::Wallets.new(dir)
       wallet = wallets.find(id)

data/test/commands/test_merge.rb

@@ -140,7 +140,7 @@ class TestMerge < Minitest::Test
   def test_merges_scenarios
     base = 'fixtures/merge'
     Dir.new(base).select { |f| File.directory?(File.join(base, f)) && !f.start_with?('.') }.each do |f|
-      Dir.mktmpdir 'test' do |dir|
+      Dir.mktmpdir do |dir|
         FileUtils.cp_r(File.join('fixtures/merge', "#{f}/."), dir)
         scores = File.join(dir, 'copies/0123456789abcdef/scores.z')
         File.write(scores, File.read(scores).gsub(/NOW/, Time.now.utc.iso8601))

data/test/commands/test_pull.rb

@@ -0,0 +1,49 @@
+# 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 'webmock/minitest'
+require_relative '../fake_home'
+require_relative '../test__helper'
+require_relative '../../lib/zold/id'
+require_relative '../../lib/zold/json_page'
+require_relative '../../lib/zold/commands/pull'
+
+# PUSH test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestPull < Minitest::Test
+  def test_pull_wallet
+    FakeHome.new.run do |home|
+      remotes = home.remotes
+      remotes.add('localhost', 80)
+      json = home.create_wallet_json
+      id = Zold::JsonPage.new(json).to_hash['id']
+      stub_request(:get, "http://localhost:80/wallet/#{id}").to_return(status: 200, body: json)
+      Zold::Pull.new(wallets: home.wallets, remotes: remotes, copies: home.copies.root.to_s, log: test_log).run(
+        ['--ignore-this-stupid-option', 'pull', id.to_s]
+      )
+      assert(home.wallets.find(Zold::Id.new(id)).exists?)
+    end
+  end
+end

data/test/commands/test_remote.rb

@@ -38,8 +38,8 @@ require_relative '../../lib/zold/commands/remote'
 # License:: MIT
 class TestRemote < Minitest::Test
   def test_updates_remote
-    Dir.mktmpdir 'test' do |dir|
-      remotes = Zold::Remotes.new(File.join(dir, 'a/b/c/remotes'))
+    Dir.mktmpdir do |dir|
+      remotes = Zold::Remotes.new(file: File.join(dir, 'a/b/c/remotes'))
       zero = Zold::Score::ZERO
       stub_request(:get, "http://#{zero.host}:#{zero.port}/remotes").to_return(
         status: 200,
@@ -73,9 +73,9 @@ class TestRemote < Minitest::Test
   end
 
   def test_elects_a_remote
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       zero = Zold::Score::ZERO
-      remotes = Zold::Remotes.new(File.join(dir, 'remotes.txt'))
+      remotes = Zold::Remotes.new(file: File.join(dir, 'remotes.txt'))
       remotes.clean
       remotes.add(zero.host, zero.port)
       stub_request(:get, "http://#{zero.host}:#{zero.port}/").to_return(
@@ -92,8 +92,8 @@ class TestRemote < Minitest::Test
   end
 
   def test_remote_trim_with_tolerate
-    Dir.mktmpdir 'test' do |dir|
-      remotes = Zold::Remotes.new(File.join(dir, 'remotes.txt'))
+    Dir.mktmpdir do |dir|
+      remotes = Zold::Remotes.new(file: File.join(dir, 'remotes.txt'))
       zero = Zold::Score::ZERO
       stub_request(:get, "http://#{zero.host}:#{zero.port}/remotes").to_return(
         status: 200,
@@ -105,14 +105,13 @@ class TestRemote < Minitest::Test
           ]
         }.to_json
       )
-      stub_request(:get, 'http://localhost:888/remotes').to_return(
-        status: 404
-      )
+      stub_request(:get, 'http://localhost:888/remotes').to_return(status: 404)
       cmd = Zold::Remote.new(remotes: remotes, log: test_log)
       cmd.run(%w[remote clean])
       assert(remotes.all.empty?)
       cmd.run(['remote', 'add', zero.host, zero.port.to_s, '--skip-ping'])
-      cmd.run(%w[remote add localhost 888 --skip-ping])
+      cmd.run(['remote', 'update', '--ignore-score-weakness', '--skip-ping'])
+      assert_equal(2, remotes.all.count)
       cmd.run(['remote', 'update', '--ignore-score-weakness'])
       cmd.run(['remote', 'trim', '--tolerate=0'])
       assert_equal(1, remotes.all.count)
@@ -127,8 +126,8 @@ class TestRemote < Minitest::Test
   end
 
   def test_select_respects_max_nodes_option
-    Dir.mktmpdir 'test' do |dir|
-      remotes = Zold::Remotes.new(File.join(dir, 'remotes.txt'))
+    Dir.mktmpdir do |dir|
+      remotes = Zold::Remotes.new(file: File.join(dir, 'remotes.txt'))
       zero = Zold::Score::ZERO
       cmd = Zold::Remote.new(remotes: remotes, log: test_log)
       (5000..5010).each do |port|

data/test/commands/test_show.rb

@@ -35,7 +35,7 @@ require_relative '../../lib/zold/commands/show'
 # License:: MIT
 class TestShow < Minitest::Test
   def test_checks_wallet_balance
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       id = Zold::Id.new
       wallets = Zold::Wallets.new(dir)
       wallet = wallets.find(id)

data/test/fake_home.rb

@@ -25,6 +25,9 @@ require_relative '../lib/zold/id'
 require_relative '../lib/zold/wallet'
 require_relative '../lib/zold/wallets'
 require_relative '../lib/zold/key'
+require_relative '../lib/zold/version'
+require_relative '../lib/zold/remotes'
+require_relative '../lib/zold/atomic_file'
 
 # Fake home dir.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -37,7 +40,7 @@ class FakeHome
   end
 
   def run
-    Dir.mktmpdir 'test' do |dir|
+    Dir.mktmpdir do |dir|
       FileUtils.copy(File.join(__dir__, '../fixtures/id_rsa'), File.join(dir, 'id_rsa'))
       yield FakeHome.new(dir)
     end
@@ -47,18 +50,37 @@ class FakeHome
     Zold::Wallets.new(@dir)
   end
 
-  def create_wallet(id = Zold::Id.new)
-    wallet = Zold::Wallet.new(File.join(@dir, id.to_s))
+  def create_wallet(id = Zold::Id.new, dir = @dir)
+    wallet = Zold::Wallet.new(File.join(dir, id.to_s))
     wallet.init(id, Zold::Key.new(file: File.join(__dir__, '../fixtures/id_rsa.pub')))
     wallet
   end
 
+  def create_wallet_json(id = Zold::Id.new)
+    require_relative '../lib/zold/score'
+    score = Zold::Score::ZERO
+    Dir.mktmpdir 'wallets' do |external_dir|
+      wallet = create_wallet(id, external_dir)
+      {
+        version: Zold::VERSION,
+        protocol: Zold::PROTOCOL,
+        id: wallet.id.to_s,
+        score: score.to_h,
+        wallets: 1,
+        mtime: wallet.mtime.utc.iso8601,
+        digest: wallet.digest,
+        balance: wallet.balance.to_i,
+        body: Zold::AtomicFile.new(wallet.path).read
+      }.to_json
+    end
+  end
+
   def copies(wallet = create_wallet)
     Zold::Copies.new(File.join(@dir, "copies/#{wallet.id}"))
   end
 
   def remotes
-    remotes = Zold::Remotes.new(File.join(@dir, 'secrets/remotes'))
+    remotes = Zold::Remotes.new(file: File.join(@dir, 'secrets/remotes'))
     remotes.clean
     remotes
   end