zold 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ea54309f6fdd147d4338a76415d536e802ffa00
-  data.tar.gz: 2cc82cfbe9c204480db65348cc551abad0817d92
+  metadata.gz: c679c519c561ea8522e9bddbf1607b376a27088f
+  data.tar.gz: acddc029d1978dd0ba26e8091d56a59a05a3b670
 SHA512:
-  metadata.gz: 64bfd2b5f86befba60e4f976cef6e4e17d3233c5a8d7d48b214dc4e4bbe787afe351a4e783355baa63f844410d1ef923feac211d6186db45215512c79fc79c8e
-  data.tar.gz: f648ceffd6b1b5c2d34fd88816cc77dc8705bf3382ae2b6a22397894fd3d1d010168736c38ce2e934196c20b50deabb41d507d6992b1c9531fc8e01a4374136a
+  metadata.gz: ba1472c49c84588d567e727e1dc364c474715cd9c6914e4f67e42a1addad4462efcd5e723362dddb2c20cf42027591ca15014d05ad9e838ce0a84816f92c49b6
+  data.tar.gz: c6ca405a5f4c99737b6b19836bb141c1b9d8604c355375c40493b2ff8c7d7c1f864e4dab8eb5bc326f6871157c1a73426287e00135ba6e8d48ad160e354df02c

data/.gitattributes

@@ -6,3 +6,4 @@
 *.rb ident
 *.xml ident
 *.png binary
+*.pdf binary

data/README.md

@@ -5,21 +5,21 @@
 [![DevOps By Rultor.com](http://www.rultor.com/b/yegor256/Zold)](http://www.rultor.com/p/yegor256/Zold)
 [![We recommend RubyMine](http://www.elegantobjects.org/rubymine.svg)](https://www.jetbrains.com/ruby/)
 
-[![Build Status](https://travis-ci.org/zerocracy/zold.svg)](https://travis-ci.org/zerocracy/zold)
+[![Build Status](https://travis-ci.org/yegor256/zold.svg)](https://travis-ci.org/yegor256/zold)
 [![Build status](https://ci.appveyor.com/api/projects/status/ypctxm5ohrtp2kr4?svg=true)](https://ci.appveyor.com/project/yegor256/zold)
-[![PDD status](http://www.0pdd.com/svg?name=zerocracy/zold)](http://www.0pdd.com/p?name=zerocracy/zold)
+[![PDD status](http://www.0pdd.com/svg?name=yegor256/zold)](http://www.0pdd.com/p?name=yegor256/zold)
 [![Gem Version](https://badge.fury.io/rb/zold.svg)](http://badge.fury.io/rb/zold)
-[![Test Coverage](https://img.shields.io/codecov/c/github/zerocracy/zold.svg)](https://codecov.io/github/zerocracy/zold?branch=master)
+[![Test Coverage](https://img.shields.io/codecov/c/github/yegor256/zold.svg)](https://codecov.io/github/yegor256/zold?branch=master)
 
-[![Dependency Status](https://gemnasium.com/zerocracy/zold.svg)](https://gemnasium.com/zerocracy/zold)
-[![Maintainability](https://api.codeclimate.com/v1/badges/7489c1d2bacde40ffc09/maintainability)](https://codeclimate.com/github/zerocracy/zold/maintainability)
+[![Dependency Status](https://gemnasium.com/yegor256/zold.svg)](https://gemnasium.com/yegor256/zold)
+[![Maintainability](https://api.codeclimate.com/v1/badges/7489c1d2bacde40ffc09/maintainability)](https://codeclimate.com/github/yegor256/zold/maintainability)
 
 **NOTICE**: It's an experiment and a very early draft! Please, feel free to
 submit your ideas or pull requests.
 
-Here is the [White Paper](https://latexonline.cc/compile?git=https%3A%2F%2Fgithub.com%2Fyegor256%2Fzold&target=wp%2Fwp.tex&command=pdflatex&trackId=1520158941887).
+Here is the [White Paper](https://github.com/yegor256/zold/raw/master/wp/wp.pdf).
 
-The license is [MIT](https://github.com/zerocracy/zold/blob/master/LICENSE.txt).
+The license is [MIT](https://github.com/yegor256/zold/blob/master/LICENSE.txt).
 
 ## How to Use
 
@@ -108,7 +108,15 @@ $ bundle update
 $ rake
 ```
 
-The build has to be clean. If it's not, [submit an issue](https://github.com/zerocracy/zold/issues).
+The build has to be clean. If it's not, [submit an issue](https://github.com/yegor256/zold/issues).
 
 Then, make your changes, make sure the build is still clean,
 and [submit a pull request](https://www.yegor256.com/2014/04/15/github-guidelines.html).
+
+If some test fails and you need to run it individually,
+check the logging configuration inside `test__helper.rb` and make
+sure the `Verbose` log is assigned to `$log`. Then, run, for example:
+
+```bash
+ruby test/commands/test_node.rb
+```

data/Rakefile

@@ -73,7 +73,7 @@ desc 'Validate all XML/XSL/XSD/HTML files for formatting'
 Xcop::RakeTask.new :xcop do |task|
   task.license = 'LICENSE.txt'
   task.includes = ['**/*.xml', '**/*.xsl', '**/*.xsd', '**/*.html']
-  task.excludes = ['target/**/*', 'coverage/**/*']
+  task.excludes = ['target/**/*', 'coverage/**/*', 'wp/**/*']
 end
 
 task :copyright do

data/bin/zold

@@ -136,7 +136,7 @@ Available options:"
     Zold::Invoice.new(wallets: wallets, log: log).run(args)
   when 'pay'
     require_relative '../lib/zold/commands/pay'
-    Zold::Pay.new(wallets: wallets, log: log).run(args)
+    Zold::Pay.new(wallets: wallets, remotes: remotes, log: log).run(args)
   when 'show'
     require_relative '../lib/zold/commands/show'
     Zold::Show.new(wallets: wallets, log: log).run(args)

data/lib/zold/amount.rb

@@ -27,16 +27,24 @@ require 'rainbow'
 module Zold
   # Amount
   class Amount
+    # How many zents are in one ZLD: 2^FRACTION
+    FRACTION = 32
+
+    # Maximum amount of zents
+    MAX = 2**63
+
     def initialize(coins: nil, zld: nil)
       if !coins.nil?
         raise "Integer is required, while #{coins.class} provided: #{coins}" unless coins.is_a?(Integer)
         @coins = coins
       elsif !zld.nil?
         raise "Float is required, while #{zld.class} provided: #{zld}" unless zld.is_a?(Float)
-        @coins = (zld * 2**24).to_i
+        @coins = (zld * 2**Amount::FRACTION).to_i
       else
         raise 'You can\'t specify both coints and zld'
       end
+      raise "The amount is too big: #{@coins}" if @coins > Amount::MAX
+      raise "The amount is too small: #{@coins}" if @coins < -Amount::MAX
     end
 
     ZERO = Amount.new(coins: 0)
@@ -46,7 +54,7 @@ module Zold
     end
 
     def to_zld
-      format('%0.2f', @coins.to_f / 2**24)
+      format('%0.2f', @coins.to_f / 2**Amount::FRACTION)
     end
 
     def to_s
@@ -98,7 +106,7 @@ module Zold
 
     def *(other)
       c = (@coins * other).to_i
-      raise "Overflow, can't multiply #{@coins} by #{m}" if c > 2**63
+      raise "Overflow, can't multiply #{@coins} by #{m}" if c > Amount::MAX
       Amount.new(coins: c)
     end
   end

data/lib/zold/commands/calculate.rb

@@ -52,6 +52,8 @@ Available options:"
           default: 8
         o.bool '--hide-hash', 'Don\'t print hash',
           default: false
+        o.bool '--hide-time', 'Don\'t print calculation time per each score',
+          default: false
         o.bool '--help', 'Print instructions'
       end
       if opts.help?
@@ -63,6 +65,7 @@ Available options:"
 
     def calculate(opts)
       start = Time.now
+      mstart = Time.now
       strength = opts[:strength]
       raise "Invalid strength: #{strength}" if strength <= 0 || strength > 8
       score = Zold::Score.new(
@@ -72,8 +75,10 @@ Available options:"
       loop do
         msg = score.to_s
         msg += (score.value > 0 ? ' ' + score.hash : '') unless opts['hide-hash']
+        msg += " #{(Time.now - mstart).round(2)}s" unless opts['hide-time']
         @log.info(msg)
         break if score.value >= opts[:max].to_i
+        mstart = Time.now
         score = score.next
       end
       seconds = (Time.now - start).round(2)

data/lib/zold/commands/merge.rb

@@ -69,9 +69,9 @@ Available options:"
       end
       modified = patch.save(wallet.path, overwrite: true)
       if modified
-        @log.debug("Merged successfully into #{wallet.path}")
+        @log.debug("#{cps.count} copies merged successfully into #{wallet.path}")
       else
-        @log.debug("Nothing changed in #{wallet.path} after merge")
+        @log.debug("Nothing changed in #{wallet.path} after merge of #{cps.count} copies")
       end
       modified
     end

data/lib/zold/commands/pay.rb

@@ -30,8 +30,9 @@ require_relative '../log'
 module Zold
   # Money sending command
   class Pay
-    def initialize(wallets:, log: Log::Quiet.new)
+    def initialize(wallets:, remotes:, log: Log::Quiet.new)
       @wallets = wallets
+      @remotes = remotes
       @log = log
     end
 
@@ -51,11 +52,14 @@ Available options:"
         o.bool '--force',
           'Ignore all validations',
           default: false
+        o.bool '--dont-pay-taxes',
+          'Don\'t pay taxes even if the wallet is in debt',
+          default: false
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
       raise 'Payer wallet ID is required as the first argument' if mine[0].nil?
-      from = @wallets.find(Zold::Id.new(mine[0]))
+      from = @wallets.find(Id.new(mine[0]))
       raise 'Wallet doesn\'t exist, do \'fetch\' first' unless from.exists?
       raise 'Recepient\'s invoice or wallet ID is required as the second argument' if mine[1].nil?
       invoice = mine[1]
@@ -64,8 +68,13 @@ Available options:"
         invoice = Invoice.new(wallets: @wallets, log: @log).run(['invoice', invoice])
       end
       raise 'Amount is required (in ZLD) as the third argument' if mine[2].nil?
-      amount = Zold::Amount.new(zld: mine[2].to_f)
+      amount = Amount.new(zld: mine[2].to_f)
       details = mine[3] ? mine[3] : '-'
+      if Tax.new(from).in_debt? && !opts['dont-pay-taxes']
+        Taxes.new(wallets: @wallets, remotes: @remotes, log: @log).run(
+          ['taxes', "--private-key=#{opts['private-key']}", id.to_s]
+        )
+      end
       pay(from, invoice, amount, details, opts)
     end
 

data/lib/zold/commands/taxes.rb

@@ -87,7 +87,7 @@ Available options:"
       tax = Tax.new(wallet)
       debt = tax.debt
       @log.debug("The current debt is #{debt} (#{debt.to_i} zents)")
-      if debt <= Tax::TRIAL
+      unless debt.in_debt?
         @log.debug("No need to pay taxes yet, until the debt is less than #{Tax::TRIAL} (#{Tax::TRIAL.to_i} zents)")
         return
       end
@@ -144,8 +144,8 @@ Available options:"
           @log.info("#{name} score #{Rainbow(score.value).red} is too weak (<#{Score::STRENGTH})")
           next
         end
-        if score.value < Tax::MIN_SCORE
-          @log.info("#{name} score #{Rainbow(score.value).red} is too small (<#{Tax::MIN_SCORE})")
+        if score.value < Tax::EXACT_SCORE
+          @log.info("#{name} score #{Rainbow(score.value).red} is too small (<#{Tax::EXACT_SCORE})")
           next
         end
         @log.info("#{score.host}:#{score.port}: #{Rainbow(score.value).green}")

data/lib/zold/node/emission.rb

@@ -40,11 +40,12 @@ module Zold
     end
 
     def quota
-      2**(-2048 / @root.age)
+      years = @root.age / (24 * 1024)
+      1 - (2**-years)
     end
 
     def limit
-      max = 2**63
+      max = Amount::MAX
       Amount.new(coins: (max * quota).to_i)
     end
 

data/lib/zold/node/entrance.rb

@@ -61,9 +61,9 @@ module Zold
         balance = wallet.balance
         raise "The balance #{balance} is negative and it's not a root wallet" if balance.negative? && !wallet.root?
         Emission.new(wallet).check
-        debt = Tax.new(wallet).debt
-        if debt > Tax::TRIAL
-          raise "Taxes are not paid, the debt is #{debt} (#{debt.to_i} zents), won't promote the wallet"
+        tax = Tax.new(wallet)
+        if tax.in_debt?
+          raise "Taxes are not paid, can't accept the wallet; the debt is #{tax.debt} (#{tax.debt.to_i} zents)"
         end
       end
     end

data/lib/zold/patch.rb

@@ -19,6 +19,7 @@
 # SOFTWARE.
 
 require_relative 'wallet'
+require_relative 'signature'
 
 # Patch.
 #
@@ -57,7 +58,7 @@ module Zold
     def save(file, overwrite: false)
       before = ''
       before = File.read(file) if File.exist?(file)
-      wallet = Zold::Wallet.new(file)
+      wallet = Wallet.new(file)
       wallet.init(@id, @key, overwrite: overwrite, network: @network)
       @txns.each { |t| wallet.add(t) }
       after = File.read(file)

data/lib/zold/prefixes.rb

@@ -32,7 +32,7 @@ module Zold
       @wallet = wallet
     end
 
-    def create(length)
+    def create(length = 8)
       raise "Length #{length} is too small" if length < 8
       raise "Length #{length} is too big" if length > 32
       key = body

data/lib/zold/score.rb

@@ -29,7 +29,9 @@ require_relative 'remotes'
 module Zold
   # Score
   class Score
+    # Default strength for the entire system, in production mode.
     STRENGTH = 6
+
     attr_reader :time, :host, :port, :invoice, :strength
     # time: UTC ISO 8601 string
     def initialize(time, host, port, invoice, suffixes = [], strength: STRENGTH)
@@ -140,6 +142,7 @@ module Zold
     end
 
     def reduced(max = 4)
+      raise "The length of the score is #{@suffixes.count}, can't reduce to #{max}" if max > @suffixes.count
       Score.new(
         @time, @host, @port, @invoice,
         @suffixes[0..max - 1], strength: @strength

data/lib/zold/tax.rb

@@ -31,8 +31,8 @@ require_relative 'amount'
 module Zold
   # A single tax payment
   class Tax
-    # The minimum score a wallet can buy in order to pay taxes.
-    MIN_SCORE = 16
+    # The exact score a wallet can buy in order to pay taxes.
+    EXACT_SCORE = 16
 
     # The maximum allowed amount in one transaction.
     MAX_PAYMENT = Amount.new(zld: 1.0)
@@ -49,22 +49,38 @@ module Zold
     # For how many days to pay at once.
     DAYS_INCREMENT = 32
 
+    # Text prefix for taxes details
+    PREFIX = 'TAXES'.freeze
+
     def initialize(wallet)
       @wallet = wallet
     end
 
+    # Check whether this tax payment already exists in the wallet.
+    def exists?(txn)
+      !@wallet.txns.find { |t| t.details.start_with?("#{Tax::PREFIX} ") && t.details == txn.details }.nil?
+    end
+
+    def details(best)
+      "#{Tax::PREFIX} #{best.reduced(Tax::EXACT_SCORE).to_text}"
+    end
+
     def pay(pvt, best)
-      fee = Tax::FEE * @wallet.txns.count * Tax::DAYS_INCREMENT * 24
-      @wallet.sub(fee, best.invoice, pvt, "TAXES #{best.to_text}")
+      fee = Tax::FEE_TXN_HOUR * @wallet.txns.count * Tax::DAYS_INCREMENT * 24
+      @wallet.sub(fee, best.invoice, pvt, details(best))
+    end
+
+    def in_debt?
+      debt > Tax::TRIAL
     end
 
     def debt
       txns = @wallet.txns
       scores = txns.map do |t|
         pfx, body = t.details.split(' ')
-        next if pfx != 'TAXES' || body.nil?
+        next if pfx != Tax::PREFIX || body.nil?
         score = Score.parse_text(body)
-        next if !score.valid? || score.value < MIN_SCORE
+        next if !score.valid? || score.value != Tax::EXACT_SCORE
         next if t.amount > Tax::MAX_PAYMENT
         score
       end.reject(&:nil?).uniq(&:hash)

data/lib/zold/txn.rb

@@ -52,11 +52,12 @@ module Zold
       raise 'Prefix can\'t be NIL' if prefix.nil?
       raise "Prefix is too short: \"#{prefix}\"" if prefix.length < 8
       raise "Prefix is too long: \"#{prefix}\"" if prefix.length > 32
+      raise "Prefix is wrong: \"#{prefix}\"" unless prefix =~ /^[a-zA-Z0-9]+$/
       @prefix = prefix
       raise 'Details can\'t be NIL' if details.nil?
       raise 'Details can\'t be empty' if details.empty?
-      raise "Details are too long: \"#{details}\"" if details.length > 128
-      raise "Details are wrong: \"#{details}\"" unless details =~ /^[a-zA-Z0-9 -\.,]{1,128}$/
+      raise "Details are too long: \"#{details}\"" if details.length > 512
+      raise "Details are wrong: \"#{details}\"" unless details =~ /^[a-zA-Z0-9 -\.,]+$/
       @details = details
     end
 
@@ -101,7 +102,7 @@ module Zold
           '([0-9a-f]{16})',
           '([A-Za-z0-9]{8,32})',
           '([0-9a-f]{16})',
-          '([a-zA-Z0-9 -\.,]{1,128})',
+          '([a-zA-Z0-9 -\.,]{1,512})',
           '([A-Za-z0-9+/]+={0,3})?'
         ].join(';') + '$'
       )

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.8'.freeze
+  VERSION = '0.9'.freeze
 end

data/lib/zold/wallet.rb

@@ -23,6 +23,7 @@ require_relative 'version'
 require_relative 'key'
 require_relative 'id'
 require_relative 'txn'
+require_relative 'tax'
 require_relative 'amount'
 require_relative 'signature'
 
@@ -97,8 +98,10 @@ module Zold
       raise "The amount can't be negative: #{amount}" if amount.negative?
       raise 'The pvt has to be of type Key' unless pvt.is_a?(Key)
       prefix, target = invoice.split('@')
+      id = max + 1
+      raise 'Too many transactions already, can\'t add more' if max > 0xffff
       txn = Txn.new(
-        max + 1,
+        id,
         Time.now,
         amount * -1,
         prefix,
@@ -112,6 +115,9 @@ module Zold
 
     def add(txn)
       raise 'The txn has to be of type Txn' unless txn.is_a?(Txn)
+      dup = txns.find { |t| t.bnf == txn.bnf && t.id == txn.id }
+      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)
       open(@file, 'a') { |f| f.print "#{txn}\n" }
     end
 

data/test/commands/test_diff.rb

@@ -19,10 +19,11 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
-require 'tmpdir'
 require 'json'
 require 'time'
 require 'webmock/minitest'
+require_relative '../test__helper'
+require_relative '../fake_home'
 require_relative '../../lib/zold/wallets'
 require_relative '../../lib/zold/wallet'
 require_relative '../../lib/zold/id'
@@ -37,24 +38,21 @@ require_relative '../../lib/zold/commands/diff'
 # License:: MIT
 class TestDiff < Minitest::Test
   def test_diff_with_copies
-    Dir.mktmpdir 'test' do |dir|
-      id = Zold::Id.new
-      wallet = Zold::Wallet.new(File.join(dir, id.to_s))
-      wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      first = Zold::Wallet.new(File.join(dir, 'copy-1'))
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      first = home.create_wallet
       File.write(first.path, File.read(wallet.path))
-      second = Zold::Wallet.new(File.join(dir, 'copy-2'))
+      second = home.create_wallet
       File.write(second.path, File.read(wallet.path))
-      Zold::Pay.new(
-        wallets: Zold::Wallets.new(dir), log: $log
-      ).run(['pay', id.to_s, second.id.to_s, '14.95', '--force', '--private-key=fixtures/id_rsa'])
-      copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
+      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: $log).run(
+        ['pay', wallet.id.to_s, second.id.to_s, '14.95', '--force', '--private-key=fixtures/id_rsa']
+      )
+      copies = home.copies(wallet)
       copies.add(File.read(first.path), 'host-1', 80, 5)
       copies.add(File.read(second.path), 'host-2', 80, 5)
-      diff = Zold::Diff.new(
-        wallets: Zold::Wallets.new(dir),
-        copies: copies.root, log: $log
-      ).run(['diff', id.to_s])
+      diff = Zold::Diff.new(wallets: home.wallets, copies: copies.root, log: $log).run(
+        ['diff', wallet.id.to_s]
+      )
       assert(diff.include?('-0001;'))
     end
   end

data/test/commands/test_merge.rb

@@ -19,11 +19,10 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
-require 'tmpdir'
-require 'json'
 require 'time'
 require 'webmock/minitest'
 require_relative '../test__helper'
+require_relative '../fake_home'
 require_relative '../../lib/zold/wallet'
 require_relative '../../lib/zold/wallets'
 require_relative '../../lib/zold/id'
@@ -40,52 +39,44 @@ require_relative '../../lib/zold/commands/pay'
 # License:: MIT
 class TestMerge < Minitest::Test
   def test_merges_wallet
-    Dir.mktmpdir 'test' do |dir|
-      id = Zold::Id.new
-      file = File.join(dir, id.to_s)
-      wallet = Zold::Wallet.new(file)
-      wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      first = Zold::Wallet.new(File.join(dir, 'copy-1'))
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      first = home.create_wallet
       File.write(first.path, File.read(wallet.path))
-      second = Zold::Wallet.new(File.join(dir, 'copy-2'))
+      second = home.create_wallet
       File.write(second.path, File.read(wallet.path))
-      Zold::Pay.new(
-        wallets: Zold::Wallets.new(dir), log: $log
-      ).run(['pay', id.to_s, second.id.to_s, '14.95', '--force', '--private-key=fixtures/id_rsa'])
-      copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
+      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: $log).run(
+        ['pay', wallet.id.to_s, second.id.to_s, '14.95', '--force', '--private-key=fixtures/id_rsa']
+      )
+      copies = home.copies(wallet)
       copies.add(File.read(first.path), 'host-1', 80, 5)
       copies.add(File.read(second.path), 'host-2', 80, 5)
-      modified = Zold::Merge.new(
-        wallets: Zold::Wallets.new(dir),
-        copies: copies.root, log: $log
-      ).run(['merge', id.to_s])
+      modified = Zold::Merge.new(wallets: home.wallets, copies: copies.root, log: $log).run(
+        ['merge', wallet.id.to_s]
+      )
       assert(1, modified.count)
-      assert(id, modified[0])
+      assert(wallet.id, modified[0])
     end
   end
 
   def test_merges_into_empty_wallet
-    Dir.mktmpdir 'test' do |dir|
-      id = Zold::Id.new
-      file = File.join(dir, id.to_s)
-      wallet = Zold::Wallet.new(file)
-      wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      first = Zold::Wallet.new(File.join(dir, 'copy-1'))
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      first = home.create_wallet
       File.write(first.path, File.read(wallet.path))
-      second = Zold::Wallet.new(File.join(dir, 'copy-2'))
+      second = home.create_wallet
       File.write(second.path, File.read(wallet.path))
-      Zold::Pay.new(
-        wallets: Zold::Wallets.new(dir), log: $log
-      ).run(['pay', id.to_s, second.id.to_s, '14.95', '--force', '--private-key=fixtures/id_rsa'])
-      copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
+      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: $log).run(
+        ['pay', wallet.id.to_s, second.id.to_s, '14.95', '--force', '--private-key=fixtures/id_rsa']
+      )
+      copies = home.copies(wallet)
       copies.add(File.read(first.path), 'host-1', 80, 5)
       copies.add(File.read(second.path), 'host-2', 80, 5)
-      modified = Zold::Merge.new(
-        wallets: Zold::Wallets.new(dir),
-        copies: copies.root, log: $log
-      ).run(['merge', id.to_s])
+      modified = Zold::Merge.new(wallets: home.wallets, copies: copies.root, log: $log).run(
+        ['merge', wallet.id.to_s]
+      )
       assert(1, modified.count)
-      assert(id, modified[0])
+      assert(wallet.id, modified[0])
     end
   end
 end

data/test/commands/test_node.rb

@@ -54,8 +54,8 @@ class TestNode < Minitest::Test
         ).run(['fetch'])
         copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
         assert_equal(1, copies.all.count)
-        assert_equal(copies.all[0][:name], '1')
-        assert_equal(copies.all[0][:score], 0)
+        assert_equal('1', copies.all[0][:name])
+        assert_equal(0, copies.all[0][:score])
       end
     end
   end

data/test/commands/test_pay.rb

@@ -33,19 +33,14 @@ require_relative '../../lib/zold/commands/pay'
 # License:: MIT
 class TestPay < Minitest::Test
   def test_sends_from_wallet_to_wallet
-    Dir.mktmpdir 'test' do |dir|
-      wallets = Zold::Wallets.new(dir)
-      sid = Zold::Id.new
-      source = wallets.find(sid)
-      source.init(sid, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      tid = Zold::Id.new
-      target = wallets.find(tid)
-      target.init(tid, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+    FakeHome.new.run do |home|
+      source = home.create_wallet
+      target = home.create_wallet
       amount = Zold::Amount.new(zld: 14.95)
-      Zold::Pay.new(wallets: wallets, log: $log).run(
+      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: $log).run(
         [
           'pay', '--force', '--private-key=fixtures/id_rsa',
-          sid.to_s, tid.to_s, amount.to_zld, 'For the car'
+          source.id.to_s, target.id.to_s, amount.to_zld, 'For the car'
         ]
       )
       assert_equal(amount * -1, source.balance)

data/test/commands/test_taxes.rb

@@ -61,7 +61,7 @@ class TestTaxes < Minitest::Test
       Zold::Taxes.new(
         wallets: wallets, remotes: remotes, log: $log
       ).run(['taxes', '--private-key=fixtures/id_rsa', id.to_s])
-      assert_equal(Zold::Amount.new(coins: 335_376_547), wallet.balance)
+      assert_equal(Zold::Amount.new(coins: 85_856_396_247), wallet.balance)
     end
   end
 end