zold 0.16.27 → 0.16.28

data/lib/zold/node/async_entrance.rb

@@ -36,7 +36,7 @@ require_relative '../dir_items'
 module Zold
   # The entrance
   class AsyncEntrance
-    def initialize(entrance, dir, log: Log::Quiet.new, threads: [Concurrent.processor_count, 4].max)
+    def initialize(entrance, dir, log: Log::NULL, threads: [Concurrent.processor_count, 4].max)
       @entrance = entrance
       @dir = File.expand_path(dir)
       @log = log
@@ -103,7 +103,7 @@ in #{Age.new(start, limit: 0.05)}: #{uuid}")
       FileUtils.rm_f(item[:file])
       @entrance.push(item[:id], body)
       @log.debug("Pushed #{item[:id]}/#{Size.new(body.length)} to #{@entrance.class.name} \
-in #{Age.new(start, limit: 0.1)} (#{@queue.size} still in the queue)")
+in #{Age.new(start, limit: 0.1)}#{@queue.size.zero? ? '' : "(#{@queue.size} still in the queue)"}")
     end
   end
 end

data/lib/zold/node/entrance.rb

@@ -38,7 +38,7 @@ require_relative '../commands/push'
 module Zold
   # The entrance
   class Entrance
-    def initialize(wallets, remotes, copies, address, log: Log::Quiet.new, network: 'test')
+    def initialize(wallets, remotes, copies, address, log: Log::NULL, network: 'test')
       @wallets = wallets
       @remotes = remotes
       @copies = copies

data/lib/zold/node/farm.rb

@@ -57,7 +57,7 @@ module Zold
     # <tt>lifetime</tt> is the amount of seconds for a score to live in the farm, by default
     # it's the entire day, since the Score expires in 24 hours; can be decreased for the
     # purpose of unit testing.
-    def initialize(invoice, cache = File.join(Dir.pwd, 'farm'), log: Log::Quiet.new,
+    def initialize(invoice, cache = File.join(Dir.pwd, 'farm'), log: Log::NULL,
       farmer: Farmers::Plain.new, lifetime: 24 * 60 * 60)
       @log = log
       @cache = File.expand_path(cache)

data/lib/zold/node/farmers.rb

@@ -44,7 +44,7 @@ module Zold
 
     # In a child process
     class Spawn
-      def initialize(log: Log::Quiet.new)
+      def initialize(log: Log::NULL)
         @log = log
       end
 

data/lib/zold/node/front.rb

@@ -434,18 +434,18 @@ in #{Age.new(@start, limit: 1)}")
     #  takes a lot of time (when the amount of wallets is big, like 40K). However,
     #  we must find a way to count them somehow faster.
     def total_wallets
-      return 256 if settings.opts['network'] == Wallet::MAIN_NETWORK
+      return 256 if settings.opts['network'] == Wallet::MAINET
       settings.wallets.all.count
     end
 
     def all_remotes
-      settings.zache.get(:remotes, lifetime: settings.opts['network'] == Wallet::MAIN_NETWORK ? 60 : 0) do
+      settings.zache.get(:remotes, lifetime: settings.opts['network'] == Wallet::MAINET ? 60 : 0) do
         settings.remotes.all
       end
     end
 
     def processes_count
-      settings.zache.get(:processes, lifetime: settings.opts['network'] == Wallet::MAIN_NETWORK ? 60 : 0) do
+      settings.zache.get(:processes, lifetime: settings.opts['network'] == Wallet::MAINET ? 60 : 0) do
         processes.count
       end
     end
@@ -459,7 +459,7 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     def score
-      settings.zache.get(:score, lifetime: settings.opts['network'] == Wallet::MAIN_NETWORK ? 60 : 0) do
+      settings.zache.get(:score, lifetime: settings.opts['network'] == Wallet::MAINET ? 60 : 0) do
         b = settings.farm.best
         raise 'Score is empty, there is something wrong with the Farm!' if b.empty?
         b[0]
@@ -476,7 +476,7 @@ in #{Age.new(@start, limit: 1)}")
       end
     end
 
-    def running_server?
+    def running_server
       false
     end
   end

data/lib/zold/node/nodup_entrance.rb

@@ -33,7 +33,7 @@ require_relative '../wallet'
 module Zold
   # The safe entrance
   class NoDupEntrance
-    def initialize(entrance, wallets, log: Log::Quiet.new)
+    def initialize(entrance, wallets, log: Log::NULL)
       @entrance = entrance
       @wallets = wallets
       @log = log

data/lib/zold/node/spread_entrance.rb

@@ -40,7 +40,7 @@ require_relative '../commands/clean'
 module Zold
   # The entrance
   class SpreadEntrance
-    def initialize(entrance, wallets, remotes, address, log: Log::Quiet.new, ignore_score_weakeness: false)
+    def initialize(entrance, wallets, remotes, address, log: Log::NULL, ignore_score_weakeness: false)
       @entrance = entrance
       @wallets = wallets
       @remotes = remotes

data/lib/zold/node/sync_entrance.rb

@@ -33,7 +33,7 @@ require_relative '../verbose_thread'
 module Zold
   # The entrance that makes sure only one thread works with a wallet
   class SyncEntrance
-    def initialize(entrance, dir, timeout: 30, log: Log::Quiet.new)
+    def initialize(entrance, dir, timeout: 30, log: Log::NULL)
       @entrance = entrance
       @dir = dir
       @timeout = timeout

data/lib/zold/patch.rb

@@ -32,7 +32,7 @@ require_relative 'signature'
 module Zold
   # A patch
   class Patch
-    def initialize(wallets, log: Log::Quiet.new)
+    def initialize(wallets, log: Log::NULL)
       @wallets = wallets
       @txns = []
       @log = log
@@ -81,7 +81,7 @@ module Zold
 #{wallet.id}/#{Amount.new(zents: balance).to_zld}/#{@txns.size} negative: #{txn.to_text}")
             next
           end
-          unless Signature.new.valid?(@key, wallet.id, txn)
+          unless Signature.new(@network).valid?(@key, wallet.id, txn)
             @log.error("Invalid RSA signature at transaction ##{txn.id} of #{wallet.id}: #{txn.to_text}")
             next
           end

data/lib/zold/remotes.rb

@@ -74,7 +74,7 @@ module Zold
 
     # One remote.
     class Remote
-      def initialize(host:, port:, score:, idx:, network: 'test', log: Log::Quiet.new)
+      def initialize(host:, port:, score:, idx:, network: 'test', log: Log::NULL)
         @host = host
         @port = port
         @score = score

data/lib/zold/signature.rb

@@ -33,6 +33,10 @@ require_relative 'txn'
 module Zold
   # A signature
   class Signature
+    def initialize(network = 'test')
+      @network = network
+    end
+
     # Sign the trasnsaction and return the signature.
     # +pvt+:: Private RSA key
     # +id+:: Paying wallet ID
@@ -52,7 +56,7 @@ module Zold
       raise 'pub must be of type Key' unless pub.is_a?(Key)
       raise 'id must be of type Id' unless id.is_a?(Id)
       raise 'txn must be of type Txn' unless txn.is_a?(Txn)
-      pub.verify(txn.sign, body(id, txn))
+      pub.verify(txn.sign, body(id, txn)) && (@network != Wallet::MAINET || id != Id::ROOT || pub == Key::ROOT)
     end
 
     private

data/lib/zold/sync_wallets.rb

@@ -30,7 +30,7 @@ require_relative 'log'
 module Zold
   # Synchronized collection of wallets
   class SyncWallets
-    def initialize(wallets, timeout: 30, log: Log::Quiet.new)
+    def initialize(wallets, timeout: 30, log: Log::NULL)
       @wallets = wallets
       @log = log
       @timeout = timeout

data/lib/zold/upgrades.rb

@@ -25,7 +25,7 @@ require_relative 'log'
 module Zold
   # Class to manage data upgrades (when zold itself upgrades).
   class Upgrades
-    def initialize(version, directory, log: Log::Verbose.new)
+    def initialize(version, directory, log: Log::VERBOSE)
       @version = version
       @directory = directory
       @log = log

data/lib/zold/verbose_thread.rb

@@ -30,7 +30,7 @@ require_relative 'log'
 module Zold
   # Verbose thread
   class VerboseThread
-    def initialize(log = Log::Quiet.new)
+    def initialize(log = Log::NULL)
       @log = log
     end
 

data/lib/zold/version.rb

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

data/lib/zold/version_file.rb

@@ -26,7 +26,7 @@ require_relative 'log'
 module Zold
   # Read and write .zoldata/version.
   class VersionFile
-    def initialize(path, log: Log::Verbose.new)
+    def initialize(path, log: Log::VERBOSE)
       @path = path
       @log = log
     end

data/lib/zold/wallet.rb

@@ -49,7 +49,7 @@ module Zold
   class Wallet
     # The name of the main production network. All other networks
     # must have different names.
-    MAIN_NETWORK = 'zold'
+    MAINET = 'zold'
 
     # The extension of the wallet files
     EXT = '.z'
@@ -136,7 +136,7 @@ module Zold
         details
       )
       txn = txn.signed(pvt, id)
-      raise 'This is not the right private key for this wallet' unless Signature.new.valid?(key, id, txn)
+      raise "Invalid private key for the wallet #{id}" unless Signature.new(network).valid?(key, id, txn)
       add(txn)
       txn
     end

data/resources/root.pub

@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA96lM5Y+QHYr9WvUucw/
+wW+dJpnYBa2/nCij3DXroCaABYL5qG4mVIjGdCBbdS78tcOlcZS+WzPcmyepg56
+cIwPkpYQop4MawaaCp6QC/nybu5sDwvnnDVWCsLveEAPbHos/BpVAJn89NeJO1M
+aJgaRLKvtRK/P9bgd5tORGJKFq17yipfjLtXKSOCX6U2nPUNB8TCaAtESHNdbp6
+kp2J063k+Mf8CT0yhFrAU5j/nRaUTKTwyyj6dcuRTn+FyfFdjfJi2mVOLMJrunN
+CSr8TNhcMB1fE5MxtwYg46s6ZkqUhQ3oNgSKBgK7DuY2TMVMgsviIZ1xkUfLR4M
+CNhjcwi9wVPNkEgTJUdjEK1m4TmNa2DWnX9oCQbYfPhze3Xv4Q3GCAUUSwvxZSO
+qKh/MdqStYOB8ByXp1sEBDsLMpR7DfpmPJm18f5winZ0pEX0U4N/7VTqSIb+w8s
+aT6YqA4WG+9ZYLKRSxwjYwkbj3cnbeq5bGXd02XjqitTHdonv1EPQvzVMxUO9RU
+bxjpPHfDIA8AdBX4rA8F5FYe2K8yMlEgbJy7Za/CAKV9c5Fut5C5eYfxQegu5ff
+mnQRuTyIZuAjZojIJWctLY2OT9SqRh0ilqJ4nq4q/eOfUuSJAUEQIZdQX9MBg3l
+J0Pw9aSoSAp8iQWRdNTvqvuTZqExs3Tp1UCAwEAAQ==
+-----END PUBLIC KEY-----

data/test/commands/test_list.rb

@@ -24,6 +24,7 @@ require 'minitest/autorun'
 require 'tmpdir'
 require_relative '../test__helper'
 require_relative '../../lib/zold/wallet'
+require_relative '../../lib/zold/wallets'
 require_relative '../../lib/zold/key'
 require_relative '../../lib/zold/id'
 require_relative '../../lib/zold/commands/list'
@@ -39,7 +40,7 @@ class TestList < Zold::Test
       wallets = Zold::Wallets.new(dir)
       wallets.acq(id) do |wallet|
         wallet.init(Zold::Id.new, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-        Zold::List.new(wallets: wallets, log: test_log).run
+        Zold::List.new(wallets: wallets, copies: File.join(dir, 'copies'), log: test_log).run
       end
     end
   end

data/test/commands/test_remote.rb

@@ -166,11 +166,42 @@ class TestRemote < Zold::Test
     end
   end
 
-  # @todo #329:30min Verify that the nodes that are being selected are
-  #  really the strongest ones. The strongest nodes are the ones with
-  #  the highest score.
   def test_select_selects_the_strongest_nodes
-    skip
+    Dir.mktmpdir do |dir|
+      remotes = Zold::Remotes.new(file: File.join(dir, 'remotes.txt'))
+      cmd = Zold::Remote.new(remotes: remotes, log: test_log)
+      suffixes = []
+      (5000..5010).each do |port|
+        score = Zold::Score.new(
+          host: 'example.com',
+          port: port,
+          invoice: 'MYPREFIX@ffffffffffffffff',
+          suffixes: suffixes << '13f7f01'
+        )
+        stub_request(:get, "http://#{score.host}:#{score.port}/remotes").to_return(
+          status: 200,
+          body: {
+            version: Zold::VERSION,
+            score: score.to_h,
+            all: [
+              { host: 'localhost', port: port }
+            ]
+          }.to_json
+        )
+        stub_request(:get, "http://localhost:#{port}/version").to_return(
+          status: 200,
+          body: {
+            version: Zold::VERSION
+          }.to_json
+        )
+        cmd.run(%W[remote add localhost #{port}])
+        remotes.rescore('localhost', port, score)
+      end
+      cmd.run(%w[remote select --max-nodes=5])
+      assert_equal(5, remotes.all.count)
+      scores = remotes.all.map { |r| r[:score] }
+      assert_equal([11, 10, 9, 8, 7], scores)
+    end
   end
 
   def test_select_respects_max_nodes_option

data/test/commands/test_show.rb

@@ -40,7 +40,7 @@ class TestShow < Zold::Test
       wallets = Zold::Wallets.new(dir)
       wallets.acq(id) do |wallet|
         wallet.init(Zold::Id.new, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-        balance = Zold::Show.new(wallets: wallets, log: test_log).run(['show', id.to_s])
+        balance = Zold::Show.new(wallets: wallets, copies: File.join(dir, 'c'), log: test_log).run(['show', id.to_s])
         assert_equal(Zold::Amount::ZERO, balance)
       end
     end

data/test/fake_home.rb

@@ -37,7 +37,7 @@ require_relative '../lib/zold/remotes'
 # License:: MIT
 class FakeHome
   attr_reader :dir
-  def initialize(dir = __dir__, log: Zold::Log::Quiet.new)
+  def initialize(dir = __dir__, log: Zold::Log::NULL)
     @dir = dir
     @log = log
   end

data/test/node/fake_node.rb

@@ -34,7 +34,7 @@ require_relative '../../lib/zold/node/front'
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 class FakeNode
-  def initialize(log: Zold::Log::Quiet.new)
+  def initialize(log: Zold::Log::NULL)
     @log = log
   end
 
@@ -43,6 +43,7 @@ class FakeNode
     FakeHome.new(log: @log).run do |home|
       RandomPort::Pool::SINGLETON.acquire do |port|
         node = Thread.new do
+          Thread.current.name = 'fake_node'
           Zold::VerboseThread.new(@log).run do
             Thread.current.abort_on_exception = true
             require_relative '../../lib/zold/commands/node'
@@ -67,7 +68,7 @@ class FakeNode
         loop do
           ping = Zold::Http.new(uri: uri).get
           break unless ping.status == 599 && node.alive?
-          @log.debug("Waiting for #{uri} (attempt no.#{attempt}): ##{ping.status}...")
+          @log.info("Waiting for #{uri} (attempt no.#{attempt}): ##{ping.status}...")
           sleep 0.5
           attempt += 1
           break if attempt > 10

data/test/node/test_farm.rb

@@ -76,7 +76,7 @@ class FarmTest < Zold::Test
           farm.best
           Time.now - start
         end.inject(&:+) / cycles
-        test_log.debug("Average speed is #{(speed * 1000).round(2)}ms in #{cycles} cycles")
+        test_log.info("Average speed is #{(speed * 1000).round(2)}ms in #{cycles} cycles")
       end
     end
   end

data/test/test__helper.rb

@@ -21,13 +21,14 @@
 # SOFTWARE.
 
 gem 'openssl'
-require 'minitest/fail_fast'
 require 'openssl'
 require 'minitest/autorun'
 require 'minitest/hooks/test'
 require 'concurrent'
 require 'timeout'
 
+require 'minitest/fail_fast' if ENV['TEST_QUIET_LOG']
+
 STDOUT.sync = true
 
 ENV['RACK_ENV'] = 'test'
@@ -74,12 +75,12 @@ module Zold
 
     def test_log
       require_relative '../lib/zold/log'
-      @test_log ||= Zold::Log::Sync.new(ENV['TEST_QUIET_LOG'] ? Zold::Log::Quiet.new : Zold::Log::Verbose.new)
+      @test_log ||= ENV['TEST_QUIET_LOG'] ? Zold::Log::NULL : Zold::Log::VERBOSE
     end
 
     class TestLogger
       attr_accessor :msgs
-      def initialize(log = Zold::Log::Quiet.new)
+      def initialize(log = Zold::Log::NULL)
         @log = log
         @msgs = []
       end

data/test/test_dir_items.rb

@@ -46,7 +46,7 @@ class TestDirItems < Zold::Test
         File.open(file, 'w+') do |f|
           f.write('test')
         end
-        test_log.debug("Saved in #{Zold::Age.new(start)}")
+        test_log.info("Saved in #{Zold::Age.new(start)}")
         sleep 1
       end
       back.kill

data/test/test_http.rb

@@ -72,6 +72,24 @@ class TestHttp < Zold::Test
     assert_equal(200, res.status)
   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.status, res)
+      thread.kill
+      thread.join
+    end
+  end
+
   def test_doesnt_terminate_on_long_call
     WebMock.allow_net_connect!
     RandomPort::Pool::SINGLETON.acquire do |port|
@@ -93,19 +111,39 @@ class TestHttp < Zold::Test
     end
   end
 
-  def test_terminates_on_timeout
+  # @todo #444:30min It's obvious that the test works (I can see that in
+  #  the console, but for some weird reason it doesn't work in Minitest. Try
+  #  to run it: ruby test/test_http.rb -n test_sends_correct_http_headers
+  #  If fails because of PUT HTTP request timeout. Let's find the problem,
+  #  fix it, and un-skip the test.
+  def test_sends_correct_http_headers
+    skip
     WebMock.allow_net_connect!
+    body = ''
     RandomPort::Pool::SINGLETON.acquire do |port|
       thread = Thread.start do
         Zold::VerboseThread.new(test_log).run do
           server = TCPServer.new(port)
-          server.accept
-          sleep 400
+          socket = server.accept
+          loop do
+            line = socket.gets
+            break if line.nil?
+            test_log.info(line.inspect)
+            body += line
+          end
+          socket.print("HTTP/1.1 200 OK\r\n")
+          socket.print("Content-Length: 4\r\n")
+          socket.print("\r\n")
+          socket.print('Done')
+          socket.close
         end
       end
-      sleep 0.25
-      res = Zold::Http.new(uri: "http://127.0.0.1:#{port}/").get(timeout: 0.1)
-      assert_equal(599, res.status, res)
+      res = Zold::Http.new(uri: "http://127.0.0.1:#{port}/").put('how are you?')
+      assert_equal(200, res.status, res)
+      assert(body.include?('Content-Length: 12'), body)
+      assert(body.include?('Content-Type: text/plain'))
+      headers = body.split("\n").select { |t| t =~ /^[a-zA-Z-]+:.+$/ }
+      assert_equal(headers.count, headers.uniq.count)
       thread.kill
       thread.join
     end