zold 0.14.42 → 0.14.43

data/lib/zold/cached_wallets.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+require 'pathname'
+require_relative 'id'
+require_relative 'wallet'
+
+# Cached collection of wallets.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Collection of local wallets
+  class CachedWallets
+    def initialize(wallets)
+      @wallets = wallets
+      @cache = {}
+      @mutex = Mutex.new
+    end
+
+    def to_s
+      @wallets.to_s
+    end
+
+    def path
+      @wallets.path
+    end
+
+    def all
+      @wallets.all
+    end
+
+    def find(id)
+      @wallets.find(id) do |wallet|
+        yield(
+          @mutex.synchronize do
+            @cache[id] = wallet unless @cache[id]
+            @cache[id]
+          end
+        )
+      end
+    end
+  end
+end

data/lib/zold/head.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative 'txn'
+
+# Head of a wallet.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Head of the wallet.
+  class Head
+    def initialize(file)
+      @file = file
+    end
+
+    def flush
+      # nothing
+    end
+
+    def fetch
+      raise "Wallet file '#{@file}' is absent" unless File.exist?(@file)
+      lines = AtomicFile.new(@file).read.split(/\n/)
+      raise "Not enough lines in #{@file}, just #{lines.count}" if lines.count < 4
+      lines.take(4)
+    end
+
+    # Cached head.
+    # Author:: Yegor Bugayenko (yegor256@gmail.com)
+    # Copyright:: Copyright (c) 2018 Yegor Bugayenko
+    # License:: MIT
+    class Cached
+      def initialize(txns)
+        @txns = txns
+      end
+
+      def flush
+        @fetch = nil
+      end
+
+      def fetch
+        @fetch ||= @txns.fetch
+      end
+    end
+  end
+end

data/lib/zold/txns.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require_relative 'txn'
+require_relative 'atomic_file'
+
+# Transactions in a wallet.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # A collection of transactions
+  class Txns
+    def initialize(file)
+      @file = file
+    end
+
+    def flush
+      # nothing
+    end
+
+    def fetch
+      raise "Wallet file '#{@file}' is absent" unless File.exist?(@file)
+      lines = AtomicFile.new(@file).read.split(/\n/)
+      raise "Not enough lines in #{@file}, just #{lines.count}" if lines.count < 4
+      lines.drop(5)
+        .each_with_index
+        .map { |line, i| Txn.parse(line, i + 6) }
+        .sort
+    end
+
+    # Cached transactions.
+    # Author:: Yegor Bugayenko (yegor256@gmail.com)
+    # Copyright:: Copyright (c) 2018 Yegor Bugayenko
+    # License:: MIT
+    class Cached
+      def initialize(txns)
+        @txns = txns
+      end
+
+      def flush
+        @fetch = nil
+      end
+
+      def fetch
+        @fetch ||= @txns.fetch
+      end
+    end
+  end
+end

data/lib/zold/version.rb

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

data/lib/zold/wallet.rb

@@ -31,6 +31,8 @@ require_relative 'amount'
 require_relative 'hexnum'
 require_relative 'signature'
 require_relative 'atomic_file'
+require_relative 'txns'
+require_relative 'head'
 
 # The wallet.
 #
@@ -52,8 +54,9 @@ module Zold
     EXTENSION = '.z'
 
     def initialize(file)
-      @file = file
-      @file = "#{file}#{EXTENSION}" if File.extname(file).empty?
+      @file = File.extname(file).empty? ? "#{file}#{EXTENSION}" : file
+      @txns = Txns::Cached.new(Txns.new(@file))
+      @head = Head::Cached.new(Head.new(@file))
     end
 
     def ==(other)
@@ -65,13 +68,13 @@ module Zold
     end
 
     def network
-      n = lines[0].strip
+      n = @head.fetch[0].strip
       raise "Invalid network name '#{n}'" unless n =~ /^[a-z]{4,16}$/
       n
     end
 
     def protocol
-      v = lines[1].strip
+      v = @head.fetch[1].strip
       raise "Invalid protocol version name '#{v}'" unless v =~ /^[0-9]+$/
       v.to_i
     end
@@ -88,6 +91,8 @@ module Zold
       raise "File '#{@file}' already exists" if File.exist?(@file) && !overwrite
       raise "Invalid network name '#{network}'" unless network =~ /^[a-z]{4,16}$/
       AtomicFile.new(@file).write("#{network}\n#{PROTOCOL}\n#{id}\n#{pubkey.to_pub}\n\n")
+      @txns.flush
+      @head.flush
     end
 
     def root?
@@ -95,7 +100,7 @@ module Zold
     end
 
     def id
-      Id.new(lines[2].strip)
+      Id.new(@head.fetch[2].strip)
     end
 
     def balance
@@ -130,6 +135,7 @@ module Zold
       raise "The transaction with the same ID and BNF already exists: #{dup}" unless dup.nil?
       raise "The tax payment already exists: #{txn}" if Tax.new(self).exists?(txn)
       File.open(@file, 'a') { |f| f.print "#{txn}\n" }
+      @txns.flush
     end
 
     def has?(id, bnf)
@@ -143,7 +149,7 @@ module Zold
     end
 
     def key
-      Key.new(text: lines[3].strip)
+      Key.new(text: @head.fetch[3].strip)
     end
 
     def income
@@ -167,16 +173,14 @@ module Zold
     end
 
     def txns
-      lines.drop(5)
-        .each_with_index
-        .map { |line, i| Txn.parse(line, i + 6) }
-        .sort
+      @txns.fetch
     end
 
     def refurbish
       AtomicFile.new(@file).write(
         "#{network}\n#{protocol}\n#{id}\n#{key.to_pub}\n\n#{txns.map { |t| t.to_s + "\n" }.join}"
       )
+      @txns.flush
     end
 
     private
@@ -185,12 +189,5 @@ module Zold
       negative = txns.select { |t| t.amount.negative? }
       negative.empty? ? 0 : negative.max_by(&:id).id
     end
-
-    def lines
-      raise "Wallet file '#{@file}' is absent" unless File.exist?(@file)
-      lines = AtomicFile.new(@file).read.split(/\n/)
-      raise "Not enough lines in #{@file}, just #{lines.count}" if lines.count < 4
-      lines
-    end
   end
 end

data/lib/zold/wallets.rb

@@ -62,7 +62,7 @@ module Zold
 
     def find(id)
       raise 'Id can\'t be nil' if id.nil?
-      raise 'Id must be of type Id' unless id.is_a?(Id)
+      raise "Id must be of type Id, #{id.class.name} instead" unless id.is_a?(Id)
       yield Zold::Wallet.new(File.join(path, id.to_s))
     end
   end

data/test/fake_home.rb

@@ -52,9 +52,12 @@ class FakeHome
   end
 
   def create_wallet(id = Zold::Id.new, dir = @dir)
-    wallet = Zold::Wallet.new(File.join(dir, id.to_s))
-    wallet.init(id, Zold::Key.new(file: File.join(__dir__, '../fixtures/id_rsa.pub')))
-    wallet
+    target = Zold::Wallet.new(File.join(dir, id.to_s))
+    wallets.find(id) do |w|
+      w.init(id, Zold::Key.new(file: File.join(__dir__, '../fixtures/id_rsa.pub')))
+      File.write(target.path, File.read(w.path))
+    end
+    target
   end
 
   def create_wallet_json(id = Zold::Id.new)

data/test/node/test_entrance.rb

@@ -56,6 +56,8 @@ class TestEntrance < Minitest::Test
       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(modified.include?(sid))
+      assert(modified.include?(tid))
     end
   end
 
@@ -65,7 +67,7 @@ class TestEntrance < Minitest::Test
       e = Zold::Entrance.new(home.wallets, home.remotes, home.copies.root, 'x', log: test_log)
       e.push(wallet.id, File.read(wallet.path))
       assert(e.to_json[:history].include?(wallet.id.to_s))
-      assert(e.to_json[:speed].positive?)
+      assert(!e.to_json[:speed].negative?)
     end
   end
 end

data/test/test_cached_wallets.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require 'tmpdir'
+require_relative 'fake_home'
+require_relative '../lib/zold/key'
+require_relative '../lib/zold/id'
+require_relative '../lib/zold/wallets'
+require_relative '../lib/zold/cached_wallets'
+require_relative '../lib/zold/amount'
+
+# CachedWallets test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestCachedWallets < Minitest::Test
+  def test_adds_wallet
+    FakeHome.new.run do |home|
+      wallets = Zold::CachedWallets.new(home.wallets)
+      id = Zold::Id.new
+      first = nil
+      wallets.find(id) do |wallet|
+        wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+        assert_equal(1, wallets.all.count)
+        first = wallet
+      end
+      wallets.find(id) do |wallet|
+        assert_equal(first, wallet)
+      end
+    end
+  end
+end

data/test/test_wallet.rb

@@ -42,6 +42,19 @@ class TestWallet < Minitest::Test
     end
   end
 
+  def test_reads_large_wallet
+    key = Zold::Key.new(file: 'fixtures/id_rsa')
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet(Zold::Id.new('448b451bc62e8e16'))
+      FileUtils.cp('fixtures/448b451bc62e8e16.z', wallet.path)
+      start = Time.now
+      wallet.txns
+      wallet.sub(Zold::Amount.new(zld: 39.99), "NOPREFIX@#{Zold::Id.new}", key)
+      time = Time.now - start
+      assert(time < 0.5, "Too slow: #{time.round(2)} seconds")
+    end
+  end
+
   def test_adds_transaction
     FakeHome.new.run do |home|
       wallet = home.create_wallet

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.42
+  version: 0.14.43
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cachy
@@ -433,6 +433,7 @@ files:
 - features/gem_package.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
+- fixtures/448b451bc62e8e16.z
 - fixtures/id_rsa
 - fixtures/id_rsa-2
 - fixtures/id_rsa-2.pub
@@ -475,6 +476,7 @@ files:
 - lib/zold/amount.rb
 - lib/zold/atomic_file.rb
 - lib/zold/backtrace.rb
+- lib/zold/cached_wallets.rb
 - lib/zold/commands/alias.rb
 - lib/zold/commands/args.rb
 - lib/zold/commands/calculate.rb
@@ -499,6 +501,7 @@ files:
 - lib/zold/commands/taxes.rb
 - lib/zold/copies.rb
 - lib/zold/gem.rb
+- lib/zold/head.rb
 - lib/zold/hexnum.rb
 - lib/zold/http.rb
 - lib/zold/hungry_wallets.rb
@@ -526,6 +529,7 @@ files:
 - lib/zold/tax.rb
 - lib/zold/tree_wallets.rb
 - lib/zold/txn.rb
+- lib/zold/txns.rb
 - lib/zold/type.rb
 - lib/zold/upgrades.rb
 - lib/zold/verbose_thread.rb
@@ -570,6 +574,7 @@ files:
 - test/test_amount.rb
 - test/test_atomic_file.rb
 - test/test_backtrace.rb
+- test/test_cached_wallets.rb
 - test/test_copies.rb
 - test/test_gem.rb
 - test/test_hexnum.rb
@@ -620,7 +625,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 2
 summary: A fast cryptocurrency for micro payments
@@ -665,6 +670,7 @@ test_files:
 - test/test_amount.rb
 - test/test_atomic_file.rb
 - test/test_backtrace.rb
+- test/test_cached_wallets.rb
 - test/test_copies.rb
 - test/test_gem.rb
 - test/test_hexnum.rb