zold 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cf98ca9682d1320a73b1abcd73b8d7b05e38e36104cf7b9aa70d5c74f182537
-  data.tar.gz: 1c63b8e0ce591b4b2082e84a2858ceac34b85c1310f4cd52a209555e8ed55443
+  metadata.gz: dec6ef3362deffe905c48db392a63691b2af28e0e1d7935705a7ccee03f72630
+  data.tar.gz: d8bc9621312050b27e2d25897585f6f8a9b5d2b0f9d4681c9a08e52ad04990d3
 SHA512:
-  metadata.gz: 17d3f4eaa73d06fc4afa419e7acb6cb5a3570150d877cf185c446b5dc75eae9f339a446a3359ccdbcb96e43cf96f18bc55ad66b972bac21b0d511d4e939e2723
-  data.tar.gz: a4167a3fa33a6d64b3a390d11c4fde7aa645e37f60027e0bb27c73ed4a9385fe0b9240ff0525e8ed511613d8f4383e7170bce2272b53ff52401d45dfbb176bf3
+  metadata.gz: 50bf436dc8d8323b83c7fae037e9de22818921e67ede7d1a2fce49c29dcffe515e1f6695199bbd36ec64668aba138782cdb82725f07ae13c2db74f78f1210b2f
+  data.tar.gz: 603a47739743f9c77c3a4f6208802534d1ad7c59b9a15d5759324c78ddba22939ae7b4b1181181e26b0de2445ac747eef31aab14e45ffbc640d9791ec8b4e7f1

data/bin/zold

@@ -201,7 +201,7 @@ cmd = lambda do
       Zold::Invoice.new(wallets: wallets, remotes: remotes, copies: copies, log: log).run(args)
     when 'pay'
       require_relative '../lib/zold/commands/pay'
-      Zold::Pay.new(wallets: wallets, remotes: remotes, log: log).run(args)
+      Zold::Pay.new(wallets: wallets, copies: copies, remotes: remotes, log: log).run(args)
     when 'show'
       require_relative '../lib/zold/commands/show'
       Zold::Show.new(wallets: wallets, copies: copies, log: log).run(args)

data/lib/zold/commands/pay.rb

@@ -37,9 +37,10 @@ module Zold
   class Pay
     prepend ThreadBadge
 
-    def initialize(wallets:, remotes:, log: Log::NULL)
+    def initialize(wallets:, remotes:, copies:, log: Log::NULL)
       @wallets = wallets
       @remotes = remotes
+      @copies = copies
       @log = log
     end
 
@@ -59,6 +60,12 @@ Available options:"
         o.bool '--force',
           'Ignore all validations',
           default: false
+        o.bool '--tolerate-edges',
+          'Don\'t fail if only "edge" (not "master" ones) nodes have the wallet',
+          default: false
+        o.integer '--tolerate-quorum',
+          'The minimum number of nodes required for a successful fetch (default: 4)',
+          default: 4
         o.bool '--dont-pay-taxes',
           'Don\'t pay taxes even if the wallet is in debt',
           default: false
@@ -74,9 +81,10 @@ Available options:"
       invoice = mine[1]
       unless invoice.include?('@')
         require_relative 'invoice'
-        invoice = Invoice.new(
-          wallets: @wallets, remotes: @remotes, copies: @copies, log: @log
-        ).run(['invoice', invoice])
+        invoice = Invoice.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
+          ['invoice', invoice, "--tolerate-quorum=#{opts['tolerate-quorum']}"] +
+          (opts['tolerate-edges'] ? ['--tolerate-edges'] : [])
+        )
       end
       raise 'Amount is required (in ZLD) as the third argument' if mine[2].nil?
       amount = Amount.new(zld: mine[2].to_f)

data/lib/zold/version.rb

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

data/test/commands/test_clean.rb

@@ -44,6 +44,15 @@ class TestClean < Zold::Test
     end
   end
 
+  def test_clean_no_copies
+    FakeHome.new(log: test_log).run do |home|
+      wallet = home.create_wallet
+      copies = home.copies(wallet)
+      Zold::Clean.new(wallets: home.wallets, copies: copies.root, log: test_log).run(['clean'])
+      assert(copies.all.empty?)
+    end
+  end
+
   def test_cleans_empty_wallets
     FakeHome.new(log: test_log).run do |home|
       Zold::Clean.new(wallets: home.wallets, copies: File.join(home.dir, 'c'), log: test_log).run(['clean'])

data/test/commands/test_diff.rb

@@ -46,7 +46,7 @@ class TestDiff < Zold::Test
       IO.write(first.path, IO.read(wallet.path))
       second = home.create_wallet
       IO.write(second.path, IO.read(wallet.path))
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
+      Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: home.remotes, log: test_log).run(
         ['pay', wallet.id.to_s, "NOPREFIX@#{Zold::Id.new}", '14.95', '--force', '--private-key=fixtures/id_rsa']
       )
       copies = home.copies(wallet)

data/test/commands/test_merge.rb

@@ -48,7 +48,7 @@ class TestMerge < Zold::Test
       IO.write(first.path, IO.read(wallet.path))
       second = home.create_wallet
       IO.write(second.path, IO.read(wallet.path))
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
+      Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: home.remotes, log: test_log).run(
         ['pay', wallet.id.to_s, "NOPREFIX@#{Zold::Id.new}", '14.95', '--force', '--private-key=fixtures/id_rsa']
       )
       copies = home.copies(wallet)
@@ -69,7 +69,7 @@ class TestMerge < Zold::Test
       IO.write(first.path, IO.read(wallet.path))
       second = home.create_wallet
       IO.write(second.path, IO.read(wallet.path))
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
+      Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: home.remotes, log: test_log).run(
         ['pay', wallet.id.to_s, "NOPREFIX@#{Zold::Id.new}", '14.95', '--force', '--private-key=fixtures/id_rsa']
       )
       copies = home.copies(wallet)

data/test/commands/test_pay.rb

@@ -21,10 +21,12 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'webmock/minitest'
 require 'threads'
 require_relative '../test__helper'
 require_relative '../fake_home'
 require_relative '../../lib/zold/wallets'
+require_relative '../../lib/zold/json_page'
 require_relative '../../lib/zold/amount'
 require_relative '../../lib/zold/key'
 require_relative '../../lib/zold/id'
@@ -40,7 +42,7 @@ class TestPay < Zold::Test
       source = home.create_wallet
       target = home.create_wallet
       amount = Zold::Amount.new(zld: 14.95)
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
+      Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: home.remotes, log: test_log).run(
         [
           'pay', '--force', '--private-key=fixtures/id_rsa',
           source.id.to_s, target.id.to_s, amount.to_zld, 'For the car'
@@ -50,12 +52,33 @@ class TestPay < Zold::Test
     end
   end
 
+  def test_pay_without_invoice
+    FakeHome.new(log: test_log).run do |home|
+      remotes = home.remotes
+      remotes.add('localhost', 4096)
+      json = home.create_wallet_json
+      id = Zold::JsonPage.new(json).to_hash['id']
+      stub_request(:get, "http://localhost:4096/wallet/#{id}/size").to_return(status: 200, body: '10000')
+      stub_request(:get, "http://localhost:4096/wallet/#{id}").to_return(status: 200, body: json)
+      home.wallets.acq(Zold::Id.new(id)) { |w| File.delete(w.path) }
+      source = home.create_wallet
+      amount = Zold::Amount.new(zld: 14.95)
+      Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: remotes, log: test_log).run(
+        [
+          'pay', '--force', '--private-key=fixtures/id_rsa', '--tolerate-edges', '--tolerate-quorum=1',
+          source.id.to_s, id, amount.to_zld, 'For the car'
+        ]
+      )
+      assert_equal(amount * -1, source.balance)
+    end
+  end
+
   def test_pay_in_many_threads
     FakeHome.new(log: test_log).run do |home|
       wallet = home.create_wallet
       amount = Zold::Amount.new(zld: 2.0)
       Threads.new(10).assert do
-        Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
+        Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: home.remotes, log: test_log).run(
           [
             'pay', '--force', '--private-key=fixtures/id_rsa',
             wallet.id.to_s, 'NOPREFIX@dddd0000dddd0000', amount.to_zld, '-'
@@ -71,7 +94,7 @@ class TestPay < Zold::Test
       source = home.create_wallet(Zold::Id::ROOT)
       target = home.create_wallet
       amount = Zold::Amount.new(zld: 14.95)
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
+      Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: home.remotes, log: test_log).run(
         [
           'pay', '--private-key=fixtures/id_rsa',
           source.id.to_s, target.id.to_s, amount.to_zld, 'For the car'
@@ -92,7 +115,7 @@ class TestPay < Zold::Test
           'NOPREFIX', Zold::Id.new, '-'
         )
       )
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
+      Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: home.remotes, log: test_log).run(
         [
           'pay', '--private-key=fixtures/id_rsa',
           source.id.to_s, target.id.to_s, amount.to_zld, 'here is the refund'
@@ -115,7 +138,7 @@ class TestPay < Zold::Test
           (@info_messages ||= []) << message
         end
       end
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: accumulating_log).run(
+      Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: home.remotes, log: accumulating_log).run(
         [
           'pay', '--force', '--private-key=fixtures/id_rsa',
           source.id.to_s, target.id.to_s, amount.to_zld, 'For the car'

data/test/commands/test_propagate.rb

@@ -37,7 +37,7 @@ class TestPropagate < Zold::Test
       wallet = home.create_wallet
       friend = home.create_wallet
       amount = Zold::Amount.new(zld: 14.95)
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
+      Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: home.remotes, log: test_log).run(
         ['pay', wallet.id.to_s, friend.id.to_s, amount.to_zld, '--force', '--private-key=fixtures/id_rsa']
       )
       Zold::Propagate.new(wallets: home.wallets, log: test_log).run(

data/test/node/test_entrance.rb

@@ -42,7 +42,7 @@ class TestEntrance < Zold::Test
     body = FakeHome.new(log: test_log).run do |home|
       source = home.create_wallet(sid)
       target = home.create_wallet(tid)
-      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: test_log).run(
+      Zold::Pay.new(wallets: home.wallets, copies: home.dir, remotes: home.remotes, log: test_log).run(
         [
           'pay', '--force', '--private-key=fixtures/id_rsa',
           source.id.to_s, target.id.to_s, '19.99', 'testing'

metadata

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