zold 0.16.24 → 0.16.25

data/lib/zold/commands/push.rb

@@ -87,14 +87,14 @@ total score for #{id} is #{total}")
         return 0
       end
       start = Time.now
-      content = @wallets.find(id) do |wallet|
+      content = @wallets.acq(id) do |wallet|
         raise "The wallet #{id} is absent" unless wallet.exists?
         IO.read(wallet.path)
       end
       uri = "/wallet/#{id}"
       response = r.http(uri).put(content, timeout: 2 + content.length * 0.01 / 1024)
-      @wallets.find(id) do |wallet|
-        if response.code == '304'
+      @wallets.acq(id) do |wallet|
+        if response.status == 304
           @log.info("#{r}: same version of #{wallet.mnemo} there, in #{Age.new(start, limit: 0.5)}")
           return 0
         end

data/lib/zold/commands/remote.rb

@@ -157,7 +157,7 @@ Available options:"
     def show
       @remotes.all.each do |r|
         score = Rainbow("/#{r[:score]}").color(r[:score].positive? ? :green : :red)
-        @log.info(r[:host] + Rainbow(":#{r[:port]}").gray + score)
+        @log.info("#{r[:host]}:#{r[:port]}#{score} #{r[:errors]} errors#{r[:default] ? ' default' : ''}")
       end
     end
 
@@ -183,12 +183,12 @@ Available options:"
         return
       end
       if opts['ignore-if-exists'] && @remotes.exists?(host, port)
-        @log.info("#{host}:#{port} already exists, won't add because of --ignore-if-exists")
+        @log.debug("#{host}:#{port} already exists, won't add because of --ignore-if-exists")
         return
       end
       unless opts['skip-ping']
         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'
+        raise "The node #{host}:#{port} is not responding, #{res.status}:#{res.status_line}" unless res.status == 200
       end
       @remotes.add(host, port)
       @log.info("#{host}:#{port} added to the list, #{@remotes.all.count} total")

data/lib/zold/commands/remove.rb

@@ -50,7 +50,7 @@ Available options:"
     end
 
     def remove(id, _)
-      @wallets.find(id) do |w|
+      @wallets.acq(id, exclusive: true) do |w|
         raise "Wallet #{id} doesn't exist in #{w.path}" unless w.exists?
         File.delete(w.path)
       end

data/lib/zold/commands/show.rb

@@ -53,7 +53,7 @@ Available options:"
       else
         total = Amount::ZERO
         mine.map { |i| Id.new(i) }.each do |id|
-          @wallets.find(id) do |w|
+          @wallets.acq(id) do |w|
             total += show(w, opts)
           end
         end

data/lib/zold/commands/taxes.rb

@@ -86,21 +86,21 @@ Available options:"
       when 'show'
         raise 'At least one wallet ID is required' unless mine[1]
         mine[1..-1].each do |id|
-          @wallets.find(Id.new(id)) do |w|
+          @wallets.acq(Id.new(id)) do |w|
             show(w, opts)
           end
         end
       when 'debt'
         raise 'At least one wallet ID is required' unless mine[1]
         mine[1..-1].each do |id|
-          @wallets.find(Id.new(id)) do |w|
+          @wallets.acq(Id.new(id)) do |w|
             debt(w, opts)
           end
         end
       when 'pay'
         raise 'At least one wallet ID is required' unless mine[1]
         mine[1..-1].each do |id|
-          @wallets.find(Id.new(id)) do |w|
+          @wallets.acq(Id.new(id), exclusive: true) do |w|
             pay(w, opts)
           end
         end

data/lib/zold/http.rb

@@ -22,8 +22,8 @@
 
 require 'rainbow'
 require 'uri'
-require 'net/http'
 require 'backtrace'
+require 'patron'
 require 'zold/score'
 require_relative 'version'
 
@@ -68,31 +68,34 @@ module Zold
     end
 
     def get(timeout: READ_TIMEOUT + CONNECT_TIMEOUT)
-      http = Net::HTTP.new(@uri.host, @uri.port)
-      http.use_ssl = @uri.scheme == 'https'
-      http.read_timeout = timeout
-      http.open_timeout = CONNECT_TIMEOUT
+      base_url = "#{@uri.scheme}://#{@uri.host}:#{@uri.port}"
+      session = Patron::Session.new(
+        timeout: timeout,
+        connect_timeout: CONNECT_TIMEOUT,
+        base_url: base_url,
+        headers: headers
+      )
       path = @uri.path
       path += '?' + @uri.query if @uri.query
-      http.request_get(path, headers)
+      session.get(path)
     rescue StandardError => e
       Error.new(e)
     end
 
     def put(body, timeout: READ_TIMEOUT + CONNECT_TIMEOUT)
-      http = Net::HTTP.new(@uri.host, @uri.port)
-      http.use_ssl = @uri.scheme == 'https'
-      http.read_timeout = timeout
-      http.open_timeout = CONNECT_TIMEOUT
-      path = @uri.path
-      path += '?' + @uri.query if @uri.query
-      http.request_put(
-        path, body,
-        headers.merge(
+      base_url = "#{@uri.scheme}://#{@uri.host}:#{@uri.port}"
+      session = Patron::Session.new(
+        timeout: timeout,
+        connect_timeout: CONNECT_TIMEOUT,
+        base_url: base_url,
+        headers: headers.merge(
           'Content-Type': 'text/plain',
           'Content-Length': body.length.to_s
         )
       )
+      path = @uri.path
+      path += '?' + @uri.query if @uri.query
+      session.put(path, body)
     rescue StandardError => e
       Error.new(e)
     end
@@ -113,15 +116,15 @@ module Zold
         Backtrace.new(@ex).to_s
       end
 
-      def code
-        '599'
+      def status
+        599
       end
 
-      def message
+      def status_line
         @ex.message
       end
 
-      def header
+      def headers
         {}
       end
     end

data/lib/zold/hungry_wallets.rb

@@ -27,8 +27,8 @@ module Zold
   class HungryWallets < SimpleDelegator
     # @todo #280:30min Add to the queue. Once in there, try
     #  to pull it as soon as possible as is described in #280.
-    def find(id)
-      yield super(id)
+    def acq(id, exclusive: false)
+      yield super(id, exclusive: exclusive)
     end
   end
 end

data/lib/zold/node/entrance.rb

@@ -91,7 +91,7 @@ module Zold
       @mutex.synchronize do
         @history.shift if @history.length >= 16
         @speed.shift if @speed.length >= 64
-        @wallets.find(id) do |wallet|
+        @wallets.acq(id) do |wallet|
           @history << "#{sec}/#{modified.count}/#{wallet.mnemo}"
         end
         @speed << sec

data/lib/zold/node/front.rb

@@ -467,12 +467,9 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     def copy_of(id)
-      Tempfile.open([id.to_s, Wallet::EXT]) do |f|
-        settings.wallets.find(id) do |wallet|
-          error(404, "Wallet ##{id} doesn't exist on the node") unless wallet.exists?
-          IO.write(f, IO.read(wallet.path))
-        end
-        yield Wallet.new(f.path)
+      settings.wallets.acq(id) do |wallet|
+        error(404, "Wallet ##{id} doesn't exist on the node") unless wallet.exists?
+        yield wallet
       end
     end
 

data/lib/zold/node/nodup_entrance.rb

@@ -50,7 +50,7 @@ module Zold
 
     # Returns a list of modifed wallets (as Zold::Id)
     def push(id, body)
-      before = @wallets.find(id) { |w| w.exists? ? w.digest : '' }
+      before = @wallets.acq(id) { |w| w.exists? ? w.digest : '' }
       after = OpenSSL::Digest::SHA256.new(body).hexdigest
       if before == after
         @log.debug("Duplicate of #{id} ignored (#{Size.new(body.length)} bytes)")

data/lib/zold/node/sync_entrance.rb

@@ -53,7 +53,7 @@ module Zold
 
     # Always returns an array with a single ID of the pushed wallet
     def push(id, body)
-      Futex.new(File.join(@dir, id), log: @log).open do
+      Futex.new(File.join(@dir, id), log: @log, timeout: 60 * 60).open do
         @entrance.push(id, body)
       end
     end

data/lib/zold/patch.rb

@@ -33,8 +33,6 @@ module Zold
   # A patch
   class Patch
     def initialize(wallets, log: Log::Quiet.new)
-      raise 'Wallets can\'t be nil' if wallets.nil?
-      raise 'Wallets must implement the contract of Wallets: method #find is required' unless wallets.respond_to?(:find)
       @wallets = wallets
       @txns = []
       @log = log
@@ -101,12 +99,12 @@ module Zold
             @log.error("Payment prefix '#{txn.prefix}' doesn't match with the key of #{wallet.id}: \"#{txn.to_text}\"")
             next
           end
-          unless @wallets.find(txn.bnf, &:exists?)
+          unless @wallets.acq(txn.bnf, &:exists?)
             @log.error("Paying wallet file is absent: #{txn.to_text}")
             next
           end
-          unless @wallets.find(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
-            @log.error("Paying wallet #{txn.bnf} doesn't have this transaction: \"#{txn.to_text}\"")
+          unless @wallets.acq(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
+            @log.error("The beneficiary of #{@id} doesn't have this transaction: \"#{txn.to_text}\"")
             next
           end
         end

data/lib/zold/remotes.rb

@@ -92,13 +92,14 @@ module Zold
       end
 
       def assert_code(code, response)
-        msg = response.message.strip
-        return if response.code.to_i == code
-        if response.header['X-Zold-Error']
-          raise "Error ##{response.code} \"#{response.header['X-Zold-Error']}\" at #{response.header['X-Zold-Path']}"
+        msg = response.status_line.strip
+        return if response.status.to_i == code
+        if response.headers['X-Zold-Error']
+          raise "Error ##{response.status} \"#{response.headers['X-Zold-Error']}\"
+            at #{response.headers['X-Zold-Path']}"
         end
-        raise "Unexpected HTTP code #{response.code}, instead of #{code}" if msg.empty?
-        raise "#{msg} (HTTP code #{response.code}, instead of #{code})"
+        raise "Unexpected HTTP code #{response.status}, instead of #{code}" if msg.empty?
+        raise "#{msg} (HTTP code #{response.status}, instead of #{code})"
       end
 
       def assert_valid_score(score)

data/lib/zold/sync_wallets.rb

@@ -48,8 +48,9 @@ module Zold
       @wallets.all
     end
 
-    def find(id)
-      @wallets.find(id) do |wallet|
+    def acq(id, exclusive: false)
+      raise 'The flag can\'t be nil' if exclusive.nil?
+      @wallets.acq(id) do |wallet|
         Futex.new(wallet.path, log: @log).open do
           yield wallet
         end

data/lib/zold/tree_wallets.rb

@@ -57,7 +57,8 @@ module Zold
       end.map { |w| Id.new(File.basename(w, Wallet::EXT)) }
     end
 
-    def find(id)
+    def acq(id, exclusive: false)
+      raise 'The flag can\'t be nil' if exclusive.nil?
       raise 'Id can\'t be nil' if id.nil?
       raise 'Id must be of type Id' unless id.is_a?(Id)
       yield Wallet.new(

data/lib/zold/version.rb

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

data/lib/zold/wallets.rb

@@ -61,7 +61,8 @@ module Zold
       end.map { |w| Id.new(File.basename(w, Wallet::EXT)) }
     end
 
-    def find(id)
+    def acq(id, exclusive: false)
+      raise 'The flag can\'t be nil' if exclusive.nil?
       raise 'Id can\'t be nil' if id.nil?
       raise "Id must be of type Id, #{id.class.name} instead" unless id.is_a?(Id)
       yield Wallet.new(File.join(path, id.to_s + Wallet::EXT))

data/test/commands/test_create.rb

@@ -38,7 +38,7 @@ class TestCreate < Zold::Test
       id = Zold::Create.new(wallets: wallets, log: test_log).run(
         ['create', '--public-key=fixtures/id_rsa.pub']
       )
-      wallets.find(id) do |wallet|
+      wallets.acq(id) do |wallet|
         assert(wallet.balance.zero?)
         assert(
           File.exist?(File.join(dir, "#{wallet.id}#{Zold::Wallet::EXT}")),

data/test/commands/test_invoice.rb

@@ -38,7 +38,7 @@ class TestInvoice < Zold::Test
     Dir.mktmpdir do |dir|
       id = Zold::Id.new
       wallets = Zold::Wallets.new(dir)
-      wallets.find(id) do |source|
+      wallets.acq(id) do |source|
         source.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
         invoice = Zold::Invoice.new(wallets: wallets, remotes: nil, copies: nil, log: test_log).run(
           ['invoice', id.to_s, '--length=16']

data/test/commands/test_list.rb

@@ -37,7 +37,7 @@ class TestList < Zold::Test
     Dir.mktmpdir do |dir|
       id = Zold::Id.new
       wallets = Zold::Wallets.new(dir)
-      wallets.find(id) do |wallet|
+      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
       end

data/test/commands/test_pull.rb

@@ -44,7 +44,7 @@ class TestPull < Zold::Test
       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]
       )
-      home.wallets.find(Zold::Id.new(id)) do |wallet|
+      home.wallets.acq(Zold::Id.new(id)) do |wallet|
         assert(wallet.exists?)
       end
     end

data/test/commands/test_show.rb

@@ -38,7 +38,7 @@ class TestShow < Zold::Test
     Dir.mktmpdir do |dir|
       id = Zold::Id.new
       wallets = Zold::Wallets.new(dir)
-      wallets.find(id) do |wallet|
+      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])
         assert_equal(Zold::Amount::ZERO, balance)

data/test/fake_home.rb

@@ -55,7 +55,7 @@ class FakeHome
 
   def create_wallet(id = Zold::Id.new, dir = @dir)
     target = Zold::Wallet.new(File.join(dir, id.to_s + Zold::Wallet::EXT))
-    wallets.find(id) do |w|
+    wallets.acq(id, exclusive: true) do |w|
       w.init(id, Zold::Key.new(file: File.expand_path(File.join(__dir__, '../fixtures/id_rsa.pub'))))
       IO.write(target.path, IO.read(w.path))
     end

data/test/node/fake_node.rb

@@ -66,8 +66,8 @@ class FakeNode
         attempt = 0
         loop do
           ping = Zold::Http.new(uri: uri).get
-          break unless ping.code == '599' && node.alive?
-          @log.debug("Waiting for #{uri} (attempt no.#{attempt}): ##{ping.code}...")
+          break unless ping.status == 599 && node.alive?
+          @log.debug("Waiting for #{uri} (attempt no.#{attempt}): ##{ping.status}...")
           sleep 0.5
           attempt += 1
           break if attempt > 10

data/test/node/test_front.rb

@@ -74,7 +74,7 @@ class FrontTest < Zold::Test
   def test_renders_public_pages
     FakeNode.new(log: test_log).run(['--ignore-score-weakness', '--no-metronome', '--threads=0']) do |port|
       {
-        '200' => [
+        200 => [
           '/robots.txt',
           '/',
           '/remotes',
@@ -87,7 +87,7 @@ class FrontTest < Zold::Test
           '/threads',
           '/ps'
         ],
-        '404' => [
+        404 => [
           '/this-is-absent',
           '/wallet/ffffeeeeddddcccc',
           '/wallet/ffffeeeeddddcccc.bin',
@@ -103,8 +103,8 @@ class FrontTest < Zold::Test
           uri = URI("http://localhost:#{port}#{p}")
           response = Zold::Http.new(uri: uri).get
           assert_equal(
-            code, response.code,
-            "Invalid response code for #{uri}: #{response.message}"
+            code, response.status,
+            "Invalid response code for #{uri}: #{response.status_line}"
           )
         end
       end
@@ -117,7 +117,7 @@ class FrontTest < Zold::Test
         host: 'localhost', port: port, invoice: 'NOPREFIX@ffffffffffffffff', strength: 1
       ).next.next.next.next
       response = Zold::Http.new(uri: "http://localhost:#{port}/remotes", score: score).get
-      assert_equal('200', response.code, response.body)
+      assert_equal(200, response.status, response.body)
       assert_equal(1, Zold::JsonPage.new(response.body).to_hash['all'].count, response.body)
       assert_match(
         /(\d{4})-(\d{2})-(\d{2})T(\d{2})\:(\d{2})\:(\d{2})Z/,
@@ -132,7 +132,7 @@ class FrontTest < Zold::Test
       3.times do |i|
         assert_equal_wait(true) do
           response = Zold::Http.new(uri: "http://localhost:#{port}/").get
-          assert_equal('200', response.code, response.body)
+          assert_equal(200, response.status, response.body)
           score = Zold::Score.parse_json(Zold::JsonPage.new(response.body).to_hash['score'])
           score.value >= i
         end
@@ -147,8 +147,8 @@ class FrontTest < Zold::Test
         base = "http://localhost:#{port}"
         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}").get.code }
+        assert_equal(200, response.status, response.body)
+        assert_equal_wait(200) { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.status }
         [
           "/wallet/#{wallet.id}.txt",
           "/wallet/#{wallet.id}.json",
@@ -162,7 +162,7 @@ class FrontTest < Zold::Test
           "/wallet/#{wallet.id}.bin",
           "/wallet/#{wallet.id}/copies"
         ].each do |u|
-          assert_equal_wait('200') { Zold::Http.new(uri: "#{base}#{u}").get.code }
+          assert_equal_wait(200) { Zold::Http.new(uri: "#{base}#{u}").get.status }
         end
       end
     end
@@ -174,14 +174,14 @@ class FrontTest < Zold::Test
         wallet = home.create_wallet
         base = "http://localhost:#{port}"
         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 }
+        assert_equal_wait(200) { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.status }
         threads = []
         mutex = Mutex.new
         Threads.new(6).assert(100) do
-          assert_equal_wait('200') do
+          assert_equal_wait(200) do
             res = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get
-            mutex.synchronize { threads << res.header['X-Zold-Thread'] }
-            res.code
+            mutex.synchronize { threads << res.headers['X-Zold-Thread'] }
+            res.status
           end
         end
         assert(threads.uniq.count > 1)
@@ -195,14 +195,14 @@ class FrontTest < Zold::Test
         wallet = home.create_wallet
         base = "http://localhost:#{port}"
         assert_equal(
-          '200',
-          Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").put(IO.read(wallet.path)).code
+          200,
+          Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").put(IO.read(wallet.path)).status
         )
-        assert_equal_wait('200') { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.code }
+        assert_equal_wait(200) { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.status }
         3.times do
           r = Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}")
             .put(IO.read(wallet.path))
-          assert_equal('304', r.code, r.body)
+          assert_equal(304, r.status, r.body)
         end
       end
     end
@@ -215,7 +215,7 @@ class FrontTest < Zold::Test
         Threads.new(5).assert do
           wallet = home.create_wallet
           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 }
+          assert_equal_wait(200) { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.status }
         end
       end
     end
@@ -258,11 +258,11 @@ class FrontTest < Zold::Test
     FakeNode.new(log: test_log).run(['--ignore-score-weakness']) do |port|
       response = Zold::Http.new(uri: URI("http://localhost:#{port}/")).get
       assert_equal(
-        '200', response.code,
-        "Expected HTTP 200 OK: Found #{response.code}"
+        200, response.status,
+        "Expected HTTP 200 OK: Found #{response.status}"
       )
       assert_operator(
-        750, :>, response['content-length'].to_i,
+        750, :>, response.body.length.to_i,
         'Expected the content to be smaller than 600 bytes for gzip'
       )
     end
@@ -286,13 +286,13 @@ class FrontTest < Zold::Test
     Time.stub :now, Time.at(0) do
       FakeNode.new(log: test_log).run(['--expose-version=9.9.9', '--no-metronome', '--threads=0']) do |port|
         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('9.9.9', response.header['X-Zold-Version'])
-        assert_equal(app.settings.protocol.to_s, response.header[Zold::Http::PROTOCOL_HEADER])
-        assert_equal('*', response.header['Access-Control-Allow-Origin'])
-        assert(response.header['X-Zold-Milliseconds'])
-        assert(!response.header[Zold::Http::SCORE_HEADER].nil?)
+        assert_equal('no-cache', response.headers['Cache-Control'])
+        assert_equal('close', response.headers['Connection'])
+        assert_equal('9.9.9', response.headers['X-Zold-Version'])
+        assert_equal(app.settings.protocol.to_s, response.headers[Zold::Http::PROTOCOL_HEADER])
+        assert_equal('*', response.headers['Access-Control-Allow-Origin'])
+        assert(response.headers['X-Zold-Milliseconds'])
+        assert(!response.headers[Zold::Http::SCORE_HEADER].nil?)
       end
     end
   end
@@ -344,12 +344,12 @@ class FrontTest < Zold::Test
         wallet = home.create_wallet(Zold::Id::ROOT)
         base = "http://localhost:#{port}"
         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 }
+        assert_equal_wait(200) { Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.status }
         cycles = 50
         cycles.times do
           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)
+          assert_equal(200, Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}").get.status)
         end
         assert_equal_wait(-10 * cycles) do
           Zold::Http.new(uri: "#{base}/wallet/#{wallet.id}/balance").get.body.to_i