zold 0.22.7 → 0.22.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c98e24178b0b7da594111beaa66a1461d04aa876efafe8b66baa2862fbef5029
-  data.tar.gz: a9cf58c9298c540621ec5bf779e3385072142dc9b727a04ea2cca1142e37ef46
+  metadata.gz: 42ca9062c455774b1da44e1cec93e5bfaffd9e56669f0c74322a14b96e2c6818
+  data.tar.gz: 442934756ba12ed8c947c0331f4852c18529f2afdaf4512e40c6e406a7eb638c
 SHA512:
-  metadata.gz: a53f3e0a978221f70fe989b8b2f4230630a34a816a3e9a580b54fb3a8e2b12c4a3cd48a46500b33e41d7ce833bfa52ad78c9aba4410ee56ee6c8a04e4918a4df
-  data.tar.gz: a511a6b96eb83db16b51c7f8db2b8613bc83d8789a0fbd0b1078c6204e6c4772a76966a4d5a42e4516b02aaafbd90ccb63747b1b7469c39348e70f8874cbc980
+  metadata.gz: 328d923df8f83833584ccc83c17e4c589f4830aba44c899e00ca6b47aeeba6e76f834efd7e4a5f7c58589f719805fa6e62763a4938f5872a6468aad312533898
+  data.tar.gz: 07ee1516be6327e02b018db91cbc8ad3c1b7fbb0800e4d282e3ad5c98d53e1aaabeb0969fcfe605dfe18d5b7955c2dc88da7d993d0c3ef04016a5ba65d67c5c6

data/lib/zold/hungry_wallets.rb

@@ -52,13 +52,15 @@ module Zold
 
     def acq(id, exclusive: false)
       @wallets.acq(id, exclusive: exclusive) do |wallet|
-        if @queue.size > 256
-          @log.error("Hungry queue is full with #{@queue.size} wallets, can't add #{id}")
-        else
-          @mutex.synchronize do
-            unless @queue.include?(id)
-              @queue << id
-              @log.debug("Hungry queue got #{id}, at the pos no.#{@queue.size - 1}")
+        unless wallet.exists?
+          if @queue.size > 256
+            @log.error("Hungry queue is full with #{@queue.size} wallets, can't add #{id}")
+          else
+            @mutex.synchronize do
+              unless @queue.include?(id)
+                @queue << id
+                @log.debug("Hungry queue got #{id}, at the pos no.#{@queue.size - 1}")
+              end
             end
           end
         end

data/lib/zold/version.rb

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

data/test/test_hungry_wallets.rb

@@ -50,4 +50,21 @@ class TestHungryWallets < Zold::Test
       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)
+      remotes = home.remotes
+      remotes.add('localhost', 4096)
+      wallet = home.create_wallet
+      get = stub_request(:get, "http://localhost:4096/wallet/#{wallet.id}").to_return(status: 200)
+      wallets = Zold::HungryWallets.new(
+        home.wallets, remotes, File.join(home.dir, 'copies'),
+        pool, log: test_log
+      )
+      wallets.acq(wallet.id) { |w| assert(w.exists?) }
+      pool.join(2)
+      assert_requested(get, times: 0)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.22.7
+  version: 0.22.8
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -751,7 +751,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.22.7!
+  Thanks for installing Zold 0.22.8!
     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