zold 0.20.3 → 0.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 894d41fc051b31c71d31c13d24e288cc73186e4f01c43bc495765fca9254c5a2
-  data.tar.gz: e0d8367e208dd8cf78960a617f5d24ff4ff281e91401c312696e8c4dd6904db7
+  metadata.gz: 8f86c74b0e0ba785befac0d7dfe8064e26ed50da6d573f291a7ee31fefc5dac7
+  data.tar.gz: 45e481a2b598866032c3fcc487bd7935f05615e7af517a8d76d998ae879bb1a2
 SHA512:
-  metadata.gz: 065e309f3cb221272695ca5a963fe2814b1c17498a0f7c70c368d9b4c281e9faafee6fe6ffbbe182791ea27bb327854540be9c711ac1ca6fcbebcaf199212419
-  data.tar.gz: 54ba0d26ab73db4c09d23bbd36b6074a107ae2c5c9a3b3ecc38b67d09a5be7b670a1b3406989e26eeee0195ac7278deb3f8ee18cc91a33dba4a6cb7b9184252b
+  metadata.gz: 74ec4dbe1a0e12603e374a9fe15d8228e4435c81d4d808e8155e4a8c4c91e42bec94a9d69b9bf1437fa3cadb2ed6fc9c04d5e84117a5c15e17d67540000864e4
+  data.tar.gz: 72d5ebdcbf091de7dd2b0d52df27390b2a0f9ddd6f3da8ef9e9dcca3eaab4b8435edc4fa01baced1199eec1edc7dd115d14543013367ed972c675d1c083ac83c

data/lib/zold/commands/fetch.rb

@@ -85,8 +85,8 @@ Available options:"
           'The name of the network we work in',
           default: 'test'
         o.integer '--threads',
-          "How many threads to use for fetching wallets (default: #{[Concurrent.processor_count / 2, 2].max})",
-          default: [Concurrent.processor_count / 2, 2].max
+          'How many threads to use for fetching wallets (default: 1)',
+          default: 1
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return

data/lib/zold/commands/push.rb

@@ -77,8 +77,8 @@ Available options:"
           'Ignore this node and don\'t push to it',
           default: []
         o.integer '--threads',
-          "How many threads to use for pushing wallets (default: #{[Concurrent.processor_count / 2, 2].max})",
-          default: [Concurrent.processor_count / 2, 2].max
+          'How many threads to use for pushing wallets (default: 1)',
+          default: 1
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return

data/lib/zold/head.rb

@@ -29,6 +29,9 @@ require_relative 'txn'
 module Zold
   # Head of the wallet.
   class Head
+    # When can't parse them.
+    class CantParse < StandardError; end
+
     def initialize(file)
       @file = file
     end
@@ -39,8 +42,11 @@ module Zold
 
     def fetch
       raise "Wallet file '#{@file}' is absent" unless File.exist?(@file)
-      lines = IO.readlines(@file, "\n").take(4)
-      raise "Not enough lines in #{@file}, just #{lines.count}" if lines.count < 4
+      lines = []
+      File.open(@file) do |f|
+        lines << f.readline while lines.count < 4 && !f.eof?
+      end
+      raise CantParse, "Not enough lines in #{@file}, just #{lines.count}" if lines.count < 4
       lines
     end
   end

data/lib/zold/txn.rb

@@ -34,6 +34,9 @@ require_relative 'signature'
 module Zold
   # A single transaction
   class Txn
+    # When can't parse them.
+    class CantParse < StandardError; end
+
     # Regular expression for details
     RE_DETAILS = '[a-zA-Z0-9 @\!\?\*_\-\.:,\'/]+'
     private_constant :RE_DETAILS
@@ -154,7 +157,7 @@ module Zold
     def self.parse(line, idx = 0)
       clean = line.strip
       parts = PTN.match(clean)
-      raise "Invalid line ##{idx}: #{line.inspect} (doesn't match #{PTN})" unless parts
+      raise CantParse, "Invalid line ##{idx}: #{line.inspect} (doesn't match #{PTN})" unless parts
       txn = Txn.new(
         Hexnum.parse(parts[:id]).to_i,
         parse_time(parts[:date]),

data/lib/zold/txns.rb

@@ -29,6 +29,9 @@ require_relative 'txn'
 module Zold
   # A collection of transactions
   class Txns
+    # When can't parse them.
+    class CantParse < StandardError; end
+
     def initialize(file)
       @file = file
     end
@@ -39,13 +42,19 @@ module Zold
 
     def fetch
       raise "Wallet file '#{@file}' is absent" unless File.exist?(@file)
-      lines = IO.readlines(@file, "\n")
-      raise "Not enough lines in #{@file}, just #{lines.count}" if lines.count < 4
-      lines.drop(5)
-        .reject { |t| t.strip.empty? }
-        .each_with_index
-        .map { |line, i| Txn.parse(line, i + 6) }
-        .sort
+      txns = []
+      i = 0
+      File.open(@file) do |f|
+        until f.eof?
+          line = f.readline
+          i += 1
+          next if i < 5
+          next if line.strip.empty?
+          txns << Txn.parse(line, i)
+        end
+      end
+      raise CantParse, "Not enough lines in #{@file}, just #{i}" if i < 4
+      txns.sort
     end
   end
 

data/lib/zold/version.rb

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

data/test/test_wallet.rb

@@ -21,6 +21,7 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
+require 'tmpdir'
 require_relative 'test__helper'
 require_relative 'fake_home'
 require_relative '../lib/zold/key'
@@ -219,6 +220,19 @@ class TestWallet < Zold::Test
     end
   end
 
+  def test_raises_when_broken_format
+    Dir.mktmpdir do |dir|
+      file = File.join(dir, "0123456701234567#{Zold::Wallet::EXT}")
+      IO.write(file, 'broken head')
+      assert_raises(Zold::Head::CantParse) do
+        Zold::Wallet.new(file).id
+      end
+      assert_raises(Zold::Txns::CantParse) do
+        Zold::Wallet.new(file).txns
+      end
+    end
+  end
+
   def test_returns_protocol
     FakeHome.new(log: test_log).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.20.3
+  version: 0.20.4
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2018-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -692,7 +692,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |-
-  Thanks for installing Zold 0.20.3!
+  Thanks for installing Zold 0.20.4!
     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