zold 0.23.2 → 0.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80fd01894077496778a2d3822bfc7769d0c4131624451c8c7b78eaab893d9f91
-  data.tar.gz: 3f37c9fd37e3f90441924e2007108407185b195e2a70c065a2bb03ae4dde019f
+  metadata.gz: dcee21bf3bb05178a256b359ede470686c37b7345357b7f719dd0c11a5d7d241
+  data.tar.gz: 3fceea07fea00200236a6222187bf31d025492983261a9c8d1d493eae748fc7b
 SHA512:
-  metadata.gz: 3a8a94e45d6887cebdba5290d87d4f453076b9c950528b5e8ed10de4bdd5a66ae670e784eab926adbfe481a78e157857d963b86218ede7a03c92693d50871c8b
-  data.tar.gz: fffd910f78c3de62a67f88e41e3a11c7c3042897949e482949bbc5e98851cd3fe5bda0335433840fc69effe6d270c2a5a2d4aae126060345ce24aad448b9af88
+  metadata.gz: c060d5f127ab9a1ee2c26245473c7005255f2e5a9a71d9b9cbea1249ee3253b27e5e90de549b98931a2cdb2ee97f06ba7d0d23bf6f350fd204d708cef191f442
+  data.tar.gz: 428a4cc6a041e838add1fa192b8e53bf837c62567b4440e1287a6fcb684e4aee57f96c1bec3e0391e0a63e5330466b91f0a3ba72d8cfddca1f804a4d58ec2899

data/lib/zold/commands/fetch.rb

@@ -50,14 +50,17 @@ module Zold
   class Fetch
     prepend ThreadBadge
 
+    # Raises when fetch fails.
+    class Error < StandardError; end
+
     # Raises when there are only edge nodes and not a single master one.
-    class EdgesOnly < StandardError; end
+    class EdgesOnly < Error; end
 
     # Raises when there are not enough successful nodes.
-    class NoQuorum < StandardError; end
+    class NoQuorum < Error; end
 
     # Raises when the wallet wasn't found in all visible nodes.
-    class NotFound < StandardError; end
+    class NotFound < Error; end
 
     def initialize(wallets:, remotes:, copies:, log: Log::NULL)
       @wallets = wallets

data/lib/zold/hungry_wallets.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'delegate'
+require 'zache'
 require_relative 'log'
 require_relative 'thread_pool'
 require_relative 'commands/pull'
@@ -44,6 +45,7 @@ module Zold
       @pool = pool
       @queue = []
       @mutex = Mutex.new
+      @missed = Zache.new
       @pool.add do
         Endless.new('hungry', log: log).run { pull }
       end
@@ -55,9 +57,12 @@ module Zold
         unless wallet.exists?
           if @queue.size > 256
             @log.error("Hungry queue is full with #{@queue.size} wallets, can't add #{id}")
+          elsif @missed.exists?(id)
+            @log.error("Hungry queue has seen #{id} just #{Age.new(@missed.mtime(id))} and it was not-found")
           else
             @mutex.synchronize do
               unless @queue.include?(id)
+                @missed.put(id, lifetime: 5 * 60)
                 @queue << id
                 @log.debug("Hungry queue got #{id}, at the pos no.#{@queue.size - 1}")
               end
@@ -73,14 +78,15 @@ module Zold
     def pull
       id = @mutex.synchronize { @queue.pop }
       if id.nil?
-        sleep 1
+        sleep 0.2
         return
       end
       begin
         Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
           ['pull', id.to_s, "--network=#{@network}", '--tolerate-edges', '--tolerate-quorum=1']
         )
-      rescue Fetch::EdgesOnly => e
+        @missed.remove(id)
+      rescue Fetch::Error => e
         @log.error("Can't hungry-pull #{id}: #{e.message}")
       end
     end

data/lib/zold/node/nospam_entrance.rb

@@ -25,6 +25,7 @@ require 'openssl'
 require 'zache'
 require_relative '../log'
 require_relative '../size'
+require_relative '../age'
 
 # The entrance that ignores something we've seen already.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -54,7 +55,8 @@ module Zold
       before = @zache.get(id.to_s, lifetime: @period) { '' }
       after = hash(id, body)
       if before == after
-        @log.debug("Spam of #{id} ignored #{Size.new(body.length)}")
+        @log.debug("Spam of #{id} ignored; the wallet content of #{Size.new(body.length)} \
+and '#{after[0..8]}' hash has already been seen #{Age.new(@zache.mtime(id.to_s))} ago")
         return []
       end
       @zache.put(id.to_s, after)

data/lib/zold/version.rb

@@ -25,7 +25,7 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.23.2'
+  VERSION = '0.23.3'
   PROTOCOL = 2
   REPO = 'zold-io/zold'
 end

data/test/fake_home.rb

@@ -46,7 +46,7 @@ class FakeHome
     Dir.mktmpdir do |dir|
       FileUtils.copy(File.expand_path(File.join(__dir__, '../fixtures/id_rsa')), File.join(dir, 'id_rsa'))
       result = yield FakeHome.new(dir, log: @log)
-      sleep 0.1 # It's a workaround against a bug (without it tests fail sporadically)
+      sleep 0.5 # It's a workaround against a bug (without it tests fail sporadically)
       result
     end
   end

data/test/test_hungry_wallets.rb

@@ -51,6 +51,26 @@ class TestHungryWallets < Zold::Test
     end
   end
 
+  def test_doesnt_pull_twice_if_not_found
+    FakeHome.new(log: test_log).run do |home|
+      id = Zold::Id.new
+      get = stub_request(:get, "http://localhost:4096/wallet/#{id}").to_return(status: 404)
+      remotes = home.remotes
+      remotes.add('localhost', 4096)
+      pool = Zold::ThreadPool.new('test', log: test_log)
+      wallets = Zold::HungryWallets.new(
+        home.wallets, remotes, File.join(home.dir, 'copies'),
+        pool, log: test_log
+      )
+      3.times do
+        wallets.acq(id) { |w| assert(!w.exists?) }
+        sleep 0.2
+      end
+      pool.join(2)
+      assert_requested(get, times: 1)
+    end
+  end
+
   def test_doesnt_pull_wallet_if_exists
     FakeHome.new(log: test_log).run do |home|
       pool = Zold::ThreadPool.new('test', log: test_log)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.23.2
+  version: 0.23.3
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -753,7 +753,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.23.2!
+  Thanks for installing Zold 0.23.3!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try ZLD online wallet at: https://wts.zold.io