zold 0.16.28 → 0.16.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a58595f5d647efa9b0ff2f58a2d975d299f9dda59ddd938f8f5c2ff4f917f37
-  data.tar.gz: 86d0ddf04dcbe3301ce6906900f0d02687c3b893702e374dcab7008e99f7fa45
+  metadata.gz: c056002cff9a87ffe6f778a5177ffb939b91f06c509755fff6837709085c24db
+  data.tar.gz: e8a1593eb1356bc2252ba0b142d335a30b06447de722cecfd0699508689972c2
 SHA512:
-  metadata.gz: '09ca8a13aca6b85dd4d1efb6dcfdeeea39b5c9bdf685e0c0d87a2b29c6de081c59e24d59d838ec2d57a20fcb1259fc1fde104aba107c3c33927a0de25638e098'
-  data.tar.gz: 18bfc9cf728d6d22d9e50287d1031e7340cb8b623ef3249523161e84fa711dba364bed0cbec34950108b4c4c5753719b59f1997813e0548a37c0d576c6d1cf70
+  metadata.gz: 4d098da93208df8f1698179e653504cccb907e8392f3fbcd88183e50a8e24cada09f54945cbe9f26fc6821d2555e2b73bcbea16f8fbe6e8ec4af7cc68f3b50d6
+  data.tar.gz: 9aaa767e15bf74b011c0c2e07b7e13b2f282fa16802beeafb508ebc045b8f3bc709a3d7ddf8b17b933bfdbb664af655ab2e16348b150086b6ffd4be5fa0cfda3

data/lib/zold/cached_wallets.rb

@@ -55,7 +55,10 @@ module Zold
 
     def acq(id, exclusive: false)
       @wallets.acq(id, exclusive: exclusive) do |wallet|
-        yield @zache.get(id.to_s, lifetime: 5 * 60) { wallet }
+        c = @zache.get(id.to_s, lifetime: 5 * 60) { wallet }
+        res = yield c
+        c.flush if exclusive
+        res
       end
     end
   end

data/lib/zold/commands/merge.rb

@@ -83,24 +83,23 @@ Available options:"
         merge_one(opts, patch, wallet, name)
         score += c[:score]
       end
-      @wallets.acq(id, exclusive: true) do |wallet|
-        start = Time.now
-        if wallet.exists?
-          merge_one(opts, patch, wallet, 'localhost')
+      start = Time.now
+      @wallets.acq(id) do |w|
+        if w.exists?
+          merge_one(opts, patch, w, 'localhost')
           @log.debug("Local copy of #{id} merged in #{Age.new(start)}: #{patch}")
         else
           @log.debug("Local copy of #{id} is absent, nothing to merge")
         end
-        modified = patch.save(wallet.path, overwrite: true)
-        wallet.flush
-        if modified
-          @log.info("#{cps.count} copies with the total score of #{score} successfully merged \
-into #{wallet.mnemo} in #{Age.new(start, limit: 0.1 + cps.count * 0.01)}")
-        else
-          @log.info("Nothing changed in #{wallet.id} after merge of #{cps.count} copies")
-        end
-        modified
       end
+      modified = @wallets.acq(id, exclusive: true) { |w| patch.save(w.path, overwrite: true) }
+      if modified
+        @log.info("#{cps.count} copies with the total score of #{score} successfully merged \
+into #{@wallets.acq(id, &:mnemo)} in #{Age.new(start, limit: 0.1 + cps.count * 0.01)}")
+      else
+        @log.info("Nothing changed in #{id} after merge of #{cps.count} copies")
+      end
+      modified
     end
 
     def merge_one(opts, patch, wallet, name)

data/lib/zold/node/async_entrance.rb

@@ -87,7 +87,7 @@ module Zold
         IO.write(file, body)
         @queue << { id: id, file: file }
         @log.debug("Added #{id}/#{Size.new(body.length)} to the queue at pos.#{@queue.size} \
-in #{Age.new(start, limit: 0.05)}: #{uuid}")
+in #{Age.new(start, limit: 0.05)}")
         break
       end
       [id]

data/lib/zold/node/front.rb

@@ -475,9 +475,5 @@ in #{Age.new(@start, limit: 1)}")
         yield wallet
       end
     end
-
-    def running_server
-      false
-    end
   end
 end

data/lib/zold/sync_wallets.rb

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

data/lib/zold/version.rb

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

data/test/node/test_entrance.rb

@@ -55,9 +55,9 @@ class TestEntrance < Zold::Test
       target = home.create_wallet(tid)
       e = Zold::Entrance.new(home.wallets, home.remotes, home.copies(source).root, 'x', log: test_log)
       modified = e.push(source.id, body)
+      assert_equal(2, modified.count)
       assert_equal(Zold::Amount.new(zld: -19.99), source.balance)
       assert_equal(Zold::Amount.new(zld: 19.99), target.balance)
-      assert_equal(2, modified.count)
       assert(modified.include?(sid))
       assert(modified.include?(tid))
     end

data/test/test_cached_wallets.rb

@@ -36,8 +36,8 @@ require_relative '../lib/zold/amount'
 # License:: MIT
 class TestCachedWallets < Zold::Test
   def test_adds_wallet
-    FakeHome.new(log: test_log).run do |home|
-      wallets = Zold::CachedWallets.new(home.wallets)
+    Dir.mktmpdir do |dir|
+      wallets = Zold::CachedWallets.new(Zold::Wallets.new(dir))
       id = Zold::Id.new
       first = nil
       wallets.acq(id, exclusive: true) do |wallet|
@@ -50,4 +50,24 @@ class TestCachedWallets < Zold::Test
       end
     end
   end
+
+  def test_flushes_correctly
+    Dir.mktmpdir do |dir|
+      wallets = Zold::CachedWallets.new(Zold::Wallets.new(dir))
+      id = Zold::Id.new
+      key = Zold::Key.new(file: 'fixtures/id_rsa')
+      body = wallets.acq(id, exclusive: true) do |wallet|
+        wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+        IO.read(wallet.path)
+      end
+      wallets.acq(id, exclusive: true) do |wallet|
+        wallet.sub(Zold::Amount.new(zld: 1.0), "NOPREFIX@#{Zold::Id.new}", key)
+      end
+      assert_equal(1, wallets.acq(id, &:txns).count)
+      wallets.acq(id, exclusive: true) do |wallet|
+        IO.write(wallet.path, body)
+      end
+      assert_equal(0, wallets.acq(id, &:txns).count)
+    end
+  end
 end

data/test/test_wallet.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require_relative 'test__helper'
 require_relative 'fake_home'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/age'
@@ -185,6 +186,25 @@ class TestWallet < Zold::Test
     end
   end
 
+  def test_flushes_and_reads_again
+    FakeHome.new(log: test_log).run do |home|
+      wallet = home.create_wallet
+      wallet.add(
+        Zold::Txn.new(
+          1,
+          Time.now,
+          Zold::Amount.new(zld: 1.99),
+          'NOPREFIX', Zold::Id.new, '-'
+        )
+      )
+      assert_equal(1, wallet.txns.count)
+      assert_equal('test', wallet.network)
+      wallet.flush
+      assert_equal(1, wallet.txns.count)
+      assert_equal('test', wallet.network)
+    end
+  end
+
   def test_returns_modified_time
     FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet

data/zold.gemspec

@@ -62,10 +62,10 @@ and suggests a different architecture for digital wallet maintenance.'
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency 'backtrace', '0.3.0'
-  s.add_runtime_dependency 'concurrent-ruby', '1.1.2'
+  s.add_runtime_dependency 'concurrent-ruby', '1.1.3'
   s.add_runtime_dependency 'cucumber', '3.1.2' # has to stay here for Heroku
   s.add_runtime_dependency 'diffy', '3.2.1'
-  s.add_runtime_dependency 'futex', '0.4.2'
+  s.add_runtime_dependency 'futex', '0.4.3'
   s.add_runtime_dependency 'get_process_mem', '0.2.3'
   s.add_runtime_dependency 'json', '2.1.0'
   s.add_runtime_dependency 'memory_profiler', '0.9.12'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.16.28
+  version: 0.16.29
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: get_process_mem
   requirement: !ruby/object:Gem::Requirement
@@ -697,7 +697,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.16.28!
+  Thanks for installing Zold 0.16.29!
     Study our White Paper: https://papers.zold.io/wp.pdf
     Read our blog posts: https://blog.zold.io
     Try online wallet at: https://wts.zold.io