zold 0.18.4 → 0.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caa27451b7402bdf03dd157ca5e95cf41178e56ca7d7e83c8269b15c758b3fa9
-  data.tar.gz: db13826b8a36fe66407b52b62bcaf2fb33113e1964582fb78916591c1adb429a
+  metadata.gz: 107b5e77f3c4f52c9331511957365add6116ffaf33fd8c1a0ffe61d86658deca
+  data.tar.gz: 38a6934d82c1fe5fafa93109bf587c5d108e703eaa8b832330845fd110be6b30
 SHA512:
-  metadata.gz: c45a552acbce84ddcdc730cf667cbc6e4cad3a8e36374b97ef05b30d6ddc2642634ee3b165b9a4af8c0e6dd37f3eabd6d794d4827fcf15a1890228a75da28e19
-  data.tar.gz: d1ef9b356816c1ad0a835f50694c6efc0d1cffa8c0faada91d95ab554ee6e7bc3428812befcc79a6d69da69ffd57b834213c12317f5b4d53d868089c8d2ee44c
+  metadata.gz: 30fc094ba1a6e69eb1e2dc8ca2b735197f29e8834c79baac950e3b1e873876beeaee169761115d9a8d50b0bbbfd8d453b9c5b6705ce0231aa5f4ed7dea5479f3
+  data.tar.gz: 92bdb792f17ba0d73b8375139dc510ac1897a637d95db712275423cbcadf4028a03ce3dc80290b37c32b55f95095a5d964b45a47043b7004c30925ed010d5621

data/lib/zold/commands/routines/gc.rb

@@ -47,7 +47,7 @@ module Zold
         removed = 0
         @wallets.all.each do |id|
           seen += 1
-          next unless @wallets.acq(id) { |w| w.txns.empty? && w.mtime < Time.now - @opts['gc-age'] }
+          next unless @wallets.acq(id) { |w| w.exists? && w.txns.empty? && w.mtime < Time.now - @opts['gc-age'] }
           cmd.run(args + [id.to_s])
           removed += 1
         end

data/lib/zold/node/front.rb

@@ -308,7 +308,7 @@ from #{request.ip} in #{Age.new(@start, limit: 1)}")
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})/txns.json} do
-      fetch { |w| pretty(w.txns.map(&:to_json)) }
+      fetch('application/json') { |w| pretty(w.txns.map(&:to_json)) }
     end
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})\.txt} do
@@ -455,11 +455,7 @@ time to stop; use --skip-oom to never quit")
       yield header
     end
 
-    # @todo #513:30min This method is temporarily disabled since it
-    #  takes a lot of time (when the amount of wallets is big, like 40K). However,
-    #  we must find a way to count them somehow faster.
     def total_wallets
-      return 256 if settings.opts['network'] == Wallet::MAINET
       settings.zache.get(:wallets, lifetime: settings.opts['no-cache'] ? 0 : 60) do
         settings.wallets.count
       end

data/lib/zold/node/soft_error.rb

@@ -26,7 +26,7 @@
 # License:: MIT
 module Zold
   # Soft error
-  module SoftError
+  class SoftError < StandardError
     # Nothing special
   end
 end

data/lib/zold/txn.rb

@@ -100,7 +100,7 @@ module Zold
         date: @date.utc.iso8601,
         amount: @amount.to_i,
         prefix: @prefix,
-        bfn: @bnf,
+        bnf: @bnf.to_s,
         details: @details,
         sign: @sign
       }

data/lib/zold/version.rb

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

data/test/node/test_safe_entrance.rb

@@ -27,6 +27,7 @@ require_relative '../../lib/zold/wallet'
 require_relative '../../lib/zold/id'
 require_relative '../../lib/zold/key'
 require_relative '../../lib/zold/node/safe_entrance'
+require_relative '../../lib/zold/node/soft_error'
 require_relative 'fake_entrance'
 
 # SafeEntrance test.
@@ -40,7 +41,7 @@ class TestSafeEntrance < Zold::Test
       amount = Zold::Amount.new(zld: 39.99)
       key = Zold::Key.new(file: 'fixtures/id_rsa')
       wallet.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
-      assert_raises StandardError do
+      assert_raises Zold::SoftError do
         Zold::SafeEntrance.new(FakeEntrance.new).push(wallet.id, IO.read(wallet.path))
       end
     end

data/test/test_age.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require_relative 'test__helper'
 require_relative '../lib/zold/age'
 
 # Age test.

data/test/test_amount.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require_relative 'test__helper'
 require_relative '../lib/zold/amount'
 
 # Amount test.

data/test/test_size.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require_relative 'test__helper'
 require_relative '../lib/zold/size'
 
 # Size test.

data/test/test_txn.rb

@@ -23,6 +23,7 @@
 require 'minitest/autorun'
 require 'tmpdir'
 require 'time'
+require_relative 'test__helper'
 require_relative '../lib/zold/id'
 require_relative '../lib/zold/txn'
 require_relative '../lib/zold/amount'
@@ -46,6 +47,21 @@ class TestTxn < Zold::Test
     assert_equal('NOPREFIX', txn.prefix)
   end
 
+  def test_converts_to_json
+    time = Time.now
+    txn = Zold::Txn.new(
+      123, time, Zold::Amount.new(zld: -99.95),
+      'NOPREFIX', Zold::Id.new('0123012301230123'),
+      'Some details to see'
+    )
+    json = txn.to_json
+    assert_equal(123, json[:id])
+    assert_equal(-429_281_981_235, json[:amount])
+    assert_equal('NOPREFIX', json[:prefix])
+    assert_equal('0123012301230123', json[:bnf])
+    assert_equal('Some details to see', json[:details])
+  end
+
   def test_accepts_text_as_details
     details = 'How are you, dude?! I\'m @yegor256: *_hello_'
     txn = Zold::Txn.parse(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.18.4
+  version: 0.18.5
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -703,7 +703,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.18.4!
+  Thanks for installing Zold 0.18.5!
     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