zold 0.16.22 → 0.16.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25ddd38e296465dbb600bfd58681aacb8a957f683bf33c7a9fe29e5ba02fbf90
-  data.tar.gz: db0590b2def1d612b9e21d4e40ca4c11260c04b622431e8132af8e29f602ced5
+  metadata.gz: d5128884745aa60eecc3b94b20b184ce5e297cf96d9550f12a20bccfa5445b01
+  data.tar.gz: 4e1403a766b2e41e99de13956a38a32fc299cc77e81047bc96c80019cb3feb53
 SHA512:
-  metadata.gz: bac8ee84186954992bb51ad8e89f7c75efb8a65c014ec8ca48603abc5c7cf9e5b4d16a33aa7c466b30ca6b0004e3c3b170369cf9da56eb4accc34774d201cc50
-  data.tar.gz: 1065f0c6ae8d17c8c714277c80b65e4ba0bfe34745e53e41200562884d1984af22f91f840182114306a53b31b3859173bc00239d9e61b171dceb3118821c300a
+  metadata.gz: 9821efb88ba25bd9836794cba697a2342978cfda9281c7507f4d08a5b44d6b4c68535da47311b3cfe44a0cab05e6a94fec7a773414e73242ba98862abd3c2f91
+  data.tar.gz: 2e3ff0c904aab956251070dfb01573022da6af3bfb9904df325c384d25795c184266c3b25826130eb91f01ce421db9cc6db5435e917f7a013180d076d9511597

data/lib/zold/commands/fetch.rb

@@ -104,7 +104,9 @@ Available options:"
         return 0
       end
       uri = "/wallet/#{id}"
-      res = r.http(uri).get(timeout: 60)
+      size = r.http(uri + '/size').get
+      r.assert_code(200, size)
+      res = r.http(uri).get(timeout: 2 + size.body.to_i * 0.01 / 1024)
       raise "Wallet #{id} not found" if res.code == '404'
       r.assert_code(200, res)
       json = JsonPage.new(res.body, uri).to_hash

data/lib/zold/commands/push.rb

@@ -92,7 +92,7 @@ total score for #{id} is #{total}")
         IO.read(wallet.path)
       end
       uri = "/wallet/#{id}"
-      response = r.http(uri).put(content, timeout: 60)
+      response = r.http(uri).put(content, timeout: 2 + content.length * 0.01 / 1024)
       @wallets.find(id) do |wallet|
         if response.code == '304'
           @log.info("#{r}: same version of #{wallet.mnemo} there, in #{Age.new(start, limit: 0.5)}")

data/lib/zold/node/front.rb

@@ -218,10 +218,7 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
-      id = Id.new(params[:id])
-      copy_of(id) do |wallet|
-        content_type('application/json')
+      fetch('application/json') do |wallet|
         pretty(
           version: settings.opts['expose-version'],
           alias: settings.node_alias,
@@ -232,7 +229,7 @@ in #{Age.new(@start, limit: 1)}")
           mtime: wallet.mtime.utc.iso8601,
           size: wallet.size,
           digest: wallet.digest,
-          copies: Copies.new(File.join(settings.copies, id)).all.count,
+          copies: Copies.new(File.join(settings.copies, wallet.id)).all.count,
           balance: wallet.balance.to_i,
           body: File.new(wallet.path).read
         )
@@ -240,10 +237,7 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16}).json} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
-      id = Id.new(params[:id])
-      copy_of(id) do |wallet|
-        content_type('application/json')
+      fetch('application/json') do |wallet|
         pretty(
           version: settings.opts['expose-version'],
           alias: settings.node_alias,
@@ -261,46 +255,35 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/balance} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
-      id = Id.new(params[:id])
-      copy_of(id) do |wallet|
-        content_type 'text/plain'
-        wallet.balance.to_i.to_s
-      end
+      fetch { |w| w.balance.to_i.to_s }
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/key} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
-      id = Id.new(params[:id])
-      copy_of(id) do |wallet|
-        content_type 'text/plain'
-        wallet.key.to_pub
-      end
+      fetch { |w| w.key.to_pub }
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/mtime} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
-      id = Id.new(params[:id])
-      copy_of(id) do |wallet|
-        content_type 'text/plain'
-        wallet.mtime.utc.iso8601.to_s
-      end
+      fetch { |w| w.mtime.utc.iso8601.to_s }
+    end
+
+    get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/size} do
+      fetch { |w| w.size.to_s }
+    end
+
+    get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/age} do
+      fetch { |w| w.age.to_s }
+    end
+
+    get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/mnemo} do
+      fetch(&:mnemo)
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/digest} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
-      id = Id.new(params[:id])
-      copy_of(id) do |wallet|
-        content_type 'text/plain'
-        wallet.digest
-      end
+      fetch(&:digest)
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.txt} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
-      id = Id.new(params[:id])
-      copy_of(id) do |wallet|
-        content_type 'text/plain'
+      fetch do |wallet|
         [
           wallet.network,
           wallet.protocol,
@@ -313,7 +296,7 @@ in #{Age.new(@start, limit: 1)}")
           "Balance: #{wallet.balance.to_zld(8)} ZLD (#{wallet.balance.to_i} zents)",
           "Transactions: #{wallet.txns.count}",
           "Taxes: #{Tax.new(wallet).paid} paid, the debt is #{Tax.new(wallet).debt}",
-          "File size: #{wallet.size} bytes (#{Copies.new(File.join(settings.copies, id)).all.count} copies)",
+          "File size: #{wallet.size} bytes (#{Copies.new(File.join(settings.copies, wallet.id)).all.count} copies)",
           "Modified: #{wallet.mtime.utc.iso8601} (#{Age.new(wallet.mtime.utc.iso8601)} ago)",
           "Digest: #{wallet.digest}"
         ].join("\n")
@@ -321,20 +304,12 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.bin} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
-      id = Id.new(params[:id])
-      copy_of(id) do |wallet|
-        content_type 'text/plain'
-        IO.read(wallet.path)
-      end
+      fetch { |w| IO.read(w.path) }
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/copies} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
-      id = Id.new(params[:id])
-      copy_of(id) do
-        content_type 'text/plain'
-        copies = Copies.new(File.join(settings.copies, id))
+      fetch do |wallet|
+        copies = Copies.new(File.join(settings.copies, wallet.id))
         copies.load.map do |c|
           "#{c[:name]}: #{c[:host]}:#{c[:port]} #{c[:score]} #{c[:time].utc.iso8601}"
         end.join("\n") +
@@ -348,13 +323,10 @@ in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/copy/(?<name>[0-9]+)} do
-      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
-      id = Id.new(params[:id])
-      name = params[:name]
-      copy_of(id) do
-        copy = Copies.new(File.join(settings.copies, id)).all.find { |c| c[:name] == name }
+      fetch do |wallet|
+        name = params[:name]
+        copy = Copies.new(File.join(settings.copies, wallet.id)).all.find { |c| c[:name] == name }
         error 404 if copy.nil?
-        content_type 'text/plain'
         IO.read(copy[:path])
       end
     end
@@ -485,6 +457,15 @@ in #{Age.new(@start, limit: 1)}")
       end
     end
 
+    def fetch(type = 'text/plain')
+      error(404, 'FETCH is disabled with --disable-fetch') if settings.opts['disable-fetch']
+      id = Id.new(params[:id])
+      copy_of(id) do |wallet|
+        content_type(type)
+        yield wallet
+      end
+    end
+
     def copy_of(id)
       Tempfile.open([id.to_s, Wallet::EXT]) do |f|
         settings.wallets.find(id) do |wallet|

data/lib/zold/patch.rb

@@ -94,11 +94,11 @@ module Zold
             next
           end
           if !txn.sign.nil? && !txn.sign.empty?
-            @log.error("RSA signature is redundant at ##{txn.id} of #{wallet.id}: #{txn.to_text}")
+            @log.error("RSA signature is redundant at ##{txn.id} of #{wallet.id}: \"#{txn.to_text}\"")
             next
           end
           unless wallet.prefix?(txn.prefix)
-            @log.error("Payment prefix '#{txn.prefix}' doesn't match with the key of #{wallet.id}: #{txn.to_text}")
+            @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?)
@@ -106,8 +106,7 @@ module Zold
             next
           end
           unless @wallets.find(txn.bnf) { |p| p.includes_negative?(txn.id, wallet.id) }
-            @log.error("Paying wallet #{txn.bnf} doesn't have transaction ##{txn.id} \
-among #{payer.txns.count} transactions: #{txn.to_text}")
+            @log.error("Paying wallet #{txn.bnf} doesn't have this transaction: \"#{txn.to_text}\"")
             next
           end
         end

data/lib/zold/version.rb

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

data/test/commands/test_fetch.rb

@@ -44,6 +44,8 @@ class TestFetch < Zold::Test
   def test_fetches_wallet
     FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
+      stub_request(:get, "http://localhost:4096/wallet/#{wallet.id}/size")
+        .to_return(status: 200, body: wallet.size.to_s)
       stub_request(:get, "http://localhost:4096/wallet/#{wallet.id}").to_return(
         status: 200,
         body: {
@@ -52,9 +54,7 @@ class TestFetch < Zold::Test
           'mtime': Time.now.utc.iso8601
         }.to_json
       )
-      stub_request(:get, "http://localhost:81/wallet/#{wallet.id}").to_return(
-        status: 404
-      )
+      stub_request(:get, "http://localhost:81/wallet/#{wallet.id}/size").to_return(status: 404)
       remotes = home.remotes
       remotes.add('localhost', 4096)
       remotes.add('localhost', 81)

data/test/commands/test_pull.rb

@@ -39,6 +39,7 @@ class TestPull < Zold::Test
       remotes.add('localhost', 4096)
       json = home.create_wallet_json
       id = Zold::JsonPage.new(json).to_hash['id']
+      stub_request(:get, "http://localhost:4096/wallet/#{id}/size").to_return(status: 200, body: '10000')
       stub_request(:get, "http://localhost:4096/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]

data/test/node/test_front.rb

@@ -156,6 +156,9 @@ class FrontTest < Zold::Test
           "/wallet/#{wallet.id}/key",
           "/wallet/#{wallet.id}/mtime",
           "/wallet/#{wallet.id}/digest",
+          "/wallet/#{wallet.id}/size",
+          "/wallet/#{wallet.id}/age",
+          "/wallet/#{wallet.id}/mnemo",
           "/wallet/#{wallet.id}.bin",
           "/wallet/#{wallet.id}/copies"
         ].each do |u|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.16.22
+  version: 0.16.23
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace