zold 0.14.3 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a77da32d7c42f8614442e76efa0eb9560e645a8
-  data.tar.gz: 5840bb2844ef57929752da61d40158a2f2eba758
+  metadata.gz: d8506b67f7b833f450efcf81d313c1598cc8a8dc
+  data.tar.gz: bbb006a82c64e5647c975d116543ebc1412b237e
 SHA512:
-  metadata.gz: ebf8e676c08b13bf103d7cf155191bbf05e95d09138a815d0357782a2e9fba499c1bb8499dfbdf39f6cf8541d181f3ad26bfd0d0399bba1912a0db28727cfb31
-  data.tar.gz: a8d9e92bfa9a5f4660bb089a6ea80862547f51b84f5fc454d5d22bd18f79a36858dbfc2949efffde70da25f6d90ba7bca68585f64062e5c58db27c8edc8b44cf
+  metadata.gz: 6c93783eea87d06905b377242838684e8e9d58e653cd3dcfeb1c384ceaec4ddc5f70ba29cb8a6089c8c0b03f03f6162a225fcb70c1f31da6b65a7a568fa987e9
+  data.tar.gz: b4dc313ac468f1484d5288c180876878150a4d9628f9a7905fb1851509aa34d54d6ad5361a1c6a203a47c142407e39fdf66b762938f8cb3b711892063fe2943a

data/bin/zold

@@ -187,7 +187,7 @@ Available options:"
     Zold::Push.new(wallets: wallets, remotes: remotes, log: log).run(args)
   when 'alias'
     require_relative '../lib/zold/commands/alias'
-    Zold::Alias.new(wallets: wallets, remotes: remotes, log: log).run(args)
+    Zold::Alias.new(wallets: wallets, log: log).run(args)
   when 'score'
     require_relative '../lib/zold/commands/calculate'
     Zold::Calculate.new(log: log).run(args)

data/lib/zold/commands/alias.rb

@@ -6,9 +6,8 @@ require_relative '../log'
 module Zold
   # Command to set an alias for wallet ID
   class Alias
-    def initialize(wallets:, remotes:, log: Log::Quiet.new)
+    def initialize(wallets:, log: Log::Quiet.new)
       @wallets = wallets
-      @remotes = remotes
       @log = log
     end
 

data/lib/zold/commands/clean.rb

@@ -57,8 +57,12 @@ Available options:"
 
     def clean(cps, _)
       deleted = cps.clean
-      @log.debug("#{deleted} expired local copies removed for #{cps}, \
-#{cps.all.count} left")
+      @log.debug("#{deleted} expired local copies removed for #{cps}, #{cps.all.count} left:")
+      cps.all.each do |c|
+        wallet = Wallet.new(c[:path])
+        @log.debug("  #{c[:name]}: #{c[:score]} #{wallet.balance}/#{wallet.txns.count}t/\
+#{wallet.digest[0, 6]}/#{File.size(c[:path])}b")
+      end
     end
   end
 end

data/lib/zold/commands/fetch.rb

@@ -55,6 +55,9 @@ Available options:"
         o.array '--ignore-node',
           'Ignore this node and don\'t fetch from it',
           default: []
+        o.string '--network',
+          'The name of the network we work in',
+          default: 'test'
         o.bool '--help', 'Print instructions'
       end
       mine = Args.new(opts, @log).take || return
@@ -99,9 +102,19 @@ Available options:"
         body = json['body']
         File.write(f, body)
         wallet = Wallet.new(f.path)
-        copy = cps.add(body, score.host, score.port, score.value)
-        @log.info("#{r} returned #{body.length}b/#{wallet.txns.count}t/#{digest(json)}/#{age(json)} as copy #{copy} \
-of #{id} in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green} (#{json['version']})")
+        wallet.refurbish
+        if wallet.protocol != Zold::PROTOCOL
+          raise "Protocol #{wallet.protocol} doesn't match #{Zold::PROTOCOL} in #{id}"
+        end
+        if wallet.network != opts['network']
+          raise "The wallet #{id} is in network #{wallet.network}, while we are in #{opts['network']}"
+        end
+        if wallet.balance.negative? && !wallet.root?
+          raise "The balance of #{id} is #{wallet.balance} and it's not a root wallet"
+        end
+        copy = cps.add(File.read(f), score.host, score.port, score.value)
+        @log.info("#{r} returned #{body.length}b/#{wallet.balance}/#{wallet.txns.count}t/#{digest(json)}/#{age(json)} \
+as copy #{copy} of #{id} in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green} (#{json['version']})")
       end
       score.value
     end
@@ -117,7 +130,7 @@ of #{id} in #{(Time.now - start).round(2)}s: #{Rainbow(score.value).green} (#{js
       return '?' if mtime.nil?
       sec = Time.now - Time.parse(mtime)
       if sec < 60
-        "#{sec}s"
+        "#{sec.round(2)}s"
       elsif sec < 60 * 60
         "#{(sec / 60).round}m"
       else

data/lib/zold/copies.rb

@@ -23,6 +23,7 @@ require 'csv'
 require_relative 'atomic_file'
 require_relative 'log'
 require_relative 'wallet'
+require_relative 'backtrace'
 
 # The list of copies.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -53,14 +54,26 @@ module Zold
         list.reject! { |s| s[:time] < Time.now - 24 * 60 * 60 }
         save(list)
         deleted = 0
-        Dir.new(@dir).select { |f| File.basename(f, Wallet::EXTENSION) =~ /^[0-9]+$/ }.each do |f|
+        files.each do |f|
           next unless list.find { |s| s[:name] == File.basename(f, Wallet::EXTENSION) }.nil?
           file = File.join(@dir, f)
           size = File.size(file)
           File.delete(file)
-          @log.debug("Copy ##{f} deleted: #{size}b")
+          @log.debug("Copy at #{f} deleted: #{size}b")
           deleted += 1
         end
+        files.each do |f|
+          file = File.join(@dir, f)
+          wallet = Wallet.new(file)
+          begin
+            wallet.refurbish
+            raise "Invalid protocol #{wallet.protocol} in #{file}" unless wallet.protocol == Zold::PROTOCOL
+          rescue StandardError => e
+            File.delete(file)
+            @log.debug("Copy at #{f} deleted: #{Backtrace.new(e)}")
+            deleted += 1
+          end
+        end
         deleted
       end
     end
@@ -153,6 +166,10 @@ module Zold
       )
     end
 
+    def files
+      Dir.new(@dir).select { |f| File.basename(f, Wallet::EXTENSION) =~ /^[0-9]+$/ }
+    end
+
     def file
       File.join(@dir, "scores#{Wallet::EXTENSION}")
     end

data/lib/zold/node/farm.rb

@@ -165,11 +165,20 @@ module Zold
     def load
       @mutex.synchronize do
         if File.exist?(@cache)
-          AtomicFile.new(@cache).read.split(/\n/).map { |t| Score.parse(t) }
+          AtomicFile.new(@cache).read.split(/\n/)
+            .map { |t| parse_score_line(t) }
+            .reject(&:zero?)
         else
           []
         end
       end
     end
+
+    def parse_score_line(line)
+      Score.parse(line)
+    rescue StandardError => e
+      @log.error(Backtrace.new(e).to_s)
+      Score::ZERO
+    end
   end
 end

data/lib/zold/node/front.rb

@@ -138,6 +138,7 @@ module Zold
         threads: "#{Thread.list.select { |t| t.status == 'run' }.count}/#{Thread.list.count}",
         wallets: settings.wallets.all.count,
         remotes: settings.remotes.all.count,
+        nscore: settings.remotes.all.map { |r| r[:score] }.inject(&:+),
         farm: settings.farm.to_json,
         entrance: settings.entrance.to_json,
         date: Time.now.utc.iso8601,

data/lib/zold/score.rb

@@ -191,5 +191,9 @@ module Zold
     def value
       @suffixes.length
     end
+
+    def zero?
+      equal?(Score::ZERO)
+    end
   end
 end

data/lib/zold/version.rb

@@ -23,6 +23,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION  = '0.14.3'.freeze
+  VERSION  = '0.14.4'.freeze
   PROTOCOL = 2
 end

data/lib/zold/wallet.rb

@@ -165,6 +165,10 @@ module Zold
         .sort_by { |t| [t.date, t.amount * -1] }
     end
 
+    def refurbish
+      AtomicFile.new(@file).write("#{network}\n#{protocol}\n#{id}\n#{key.to_pub}\n\n#{txns.join("\n")}\n")
+    end
+
     private
 
     def max

data/test/commands/test_alias.rb

@@ -1,7 +1,54 @@
 require 'minitest/autorun'
+require_relative '../test__helper'
+require_relative '../fake_home'
+require_relative '../../lib/zold/commands/alias'
 
-# @todo #279:30min Write unit tests for the alias command.
-#  It should test all the subcommands (set, remove and show)
-#  and any options.
 class TestAlias < Minitest::Test
+  # alias set <wallet> <alias>
+  # @todo #322:30min Implement the set command and unskip this test.
+  #  The syntax is already documented in the alias command in the help.
+  def test_set_writes_alias_to_the_alias_file
+    skip
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      Zold::Alias.new(wallets: home.wallets, log: test_log).run(%W[set #{wallet.id} my-alias])
+      assert_equal read_alias_file(home), %W[my-alias #{wallet.id}]
+    end
+  end
+
+  # alias remove <alias>
+  # @todo #322:30min Implement the remove command and unskip this test.
+  #  The syntax is already documented in the alias command in the help.
+  def test_remove_removes_the_alias_from_the_alias_file
+    skip
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      cmd = Zold::Alias.new(wallets: home.wallets, log: test_log)
+      cmd.run(%W[set #{wallet.id} my-alias])
+      assert_equal read_alias_file(home), %W[my-alias #{wallet.id}]
+      cmd.run(%w[remove my-alias])
+      assert_empty read_alias_file(home)
+    end
+  end
+
+  # alias show <alias>
+  # @todo #322:30min Implement the show command and unskip this test.
+  #  The syntax is already documented in the alias command in the help.
+  def test_show_prints_out_the_aliased_wallet_id
+    skip
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      cmd = Zold::Alias.new(wallets: home.wallets, log: test_log)
+      cmd.run(%W[set #{wallet.id} my-alias])
+      assert_equal read_alias_file(home), %W[my-alias #{wallet.id}]
+      stdout, = capture_io { cmd.run(%w[show my-alias]) }
+      assert_match wallet.id.to_s, stdout
+    end
+  end
+
+  private
+
+  def read_alias_file(home)
+    File.read(File.join(home.dir, 'aliases')).split(' ')
+  end
 end

data/test/node/test_farm.rb

@@ -26,6 +26,15 @@ require_relative '../../lib/zold/log'
 require_relative '../../lib/zold/node/farm'
 
 class FarmTest < Minitest::Test
+  class SaveLastMessageLogger
+    attr_reader :msg
+    def error(msg)
+      @msg = msg
+    end
+
+    def debug(msg); end
+  end
+
   def test_renders_in_json
     Dir.mktmpdir 'test' do |dir|
       farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', File.join(dir, 'f'), log: test_log)
@@ -107,4 +116,28 @@ class FarmTest < Minitest::Test
       end
     end
   end
+
+  def test_garbage_farm_file
+    log = SaveLastMessageLogger.new
+    Dir.mktmpdir 'test' do |dir|
+      file = File.join(dir, 'corrupted_farm')
+      [
+        '0/6: 2018-06-26ABCT00:32:43Z 178.128.165.12 4096 MIRhypo1@c13620484b46caa4',
+        'some garbage'
+      ].each do |score_garbage_line|
+        valid_score = Zold::Score.new(
+          Time.parse('2017-07-19T21:24:51Z'),
+          'some-host', 9999, 'NOPREFIX@ffffffffffffffff', %w[13f7f01 b2b32b 4ade7e],
+          strength: 6
+        )
+        File.open(file, 'w') do |f|
+          f.puts(score_garbage_line)
+          f.puts(valid_score)
+        end
+        farm = Zold::Farm.new('NOPREFIX@ffffffffffffffff', file, log: log)
+        assert_equal(1, farm.best.count)
+        assert(log.msg.include?('Invalid score'))
+      end
+    end
+  end
 end

data/test/test_copies.rb

@@ -21,6 +21,9 @@
 require 'minitest/autorun'
 require 'tmpdir'
 require 'time'
+require_relative 'fake_home'
+require_relative 'test__helper'
+require_relative '../lib/zold/id'
 require_relative '../lib/zold/copies'
 require_relative '../lib/zold/wallet'
 
@@ -31,32 +34,32 @@ require_relative '../lib/zold/wallet'
 class TestCopies < Minitest::Test
   def test_adds_and_removes_copies
     Dir.mktmpdir 'test' do |dir|
-      copies = Zold::Copies.new(File.join(dir, 'my/a/copies'))
-      copies.add('hello 1', '192.168.0.1', 80, 1)
-      copies.add('hello 2', '192.168.0.2', 80, 3)
-      copies.add('hello 2', '192.168.0.3', 80, 7)
-      copies.add('hello 1', '192.168.0.4', 80, 10)
-      copies.add('hello-to-delete', '192.168.0.5', 80, 10)
+      copies = Zold::Copies.new(File.join(dir, 'my/a/copies'), log: test_log)
+      copies.add(content('alpha'), '192.168.0.1', 80, 1)
+      copies.add(content('beta'), '192.168.0.2', 80, 3)
+      copies.add(content('beta'), '192.168.0.3', 80, 7)
+      copies.add(content('alpha'), '192.168.0.4', 80, 10)
+      copies.add(content('hello-to-delete'), '192.168.0.5', 80, 10)
       copies.remove('192.168.0.5', 80)
-      assert(2, copies.all.count)
-      assert(copies.all.find { |c| c[:name] == '1' }[:score] == 11)
+      assert_equal(2, copies.all.count)
+      assert_equal(11, copies.all.find { |c| c[:name] == '1' }[:score])
     end
   end
 
   def test_lists_empty_dir
     Dir.mktmpdir 'test' do |dir|
-      copies = Zold::Copies.new(File.join(dir, 'xxx'))
+      copies = Zold::Copies.new(File.join(dir, 'xxx'), log: test_log)
       assert(copies.all.empty?, "#{copies.all.count} is not zero")
     end
   end
 
   def test_overwrites_host
     Dir.mktmpdir 'test' do |dir|
-      copies = Zold::Copies.new(File.join(dir, 'my/a/copies'))
+      copies = Zold::Copies.new(File.join(dir, 'my/a/copies-2'), log: test_log)
       host = 'b1.zold.io'
-      copies.add('z1', host, 80, 5)
-      copies.add('z1', host, 80, 6)
-      copies.add('z1', host, 80, 7)
+      copies.add(content('z1'), host, 80, 5)
+      copies.add(content('z1'), host, 80, 6)
+      copies.add(content('z1'), host, 80, 7)
       assert(copies.all.count == 1, "#{copies.all.count} is not equal to 1")
       assert(copies.all[0][:score] == 7, "#{copies.all[0][:score]} is not 7")
     end
@@ -64,9 +67,9 @@ class TestCopies < Minitest::Test
 
   def test_cleans_copies
     Dir.mktmpdir 'test' do |dir|
-      copies = Zold::Copies.new(dir)
-      copies.add('h1', 'zold.io', 50, 80, Time.now - 25 * 60 * 60)
-      copies.add('h1', 'zold.io', 33, 80, Time.now - 26 * 60 * 60)
+      copies = Zold::Copies.new(dir, log: test_log)
+      copies.add(content('h1'), 'zold.io', 4096, 10, Time.now - 25 * 60 * 60)
+      copies.add(content('h1'), 'zold.io', 4097, 20, Time.now - 26 * 60 * 60)
       assert(File.exist?(File.join(dir, "1#{Zold::Wallet::EXTENSION}")))
       copies.clean
       assert(copies.all.empty?, "#{copies.all.count} is not empty")
@@ -74,10 +77,19 @@ class TestCopies < Minitest::Test
     end
   end
 
+  def test_cleans_broken_copies
+    Dir.mktmpdir 'test' do |dir|
+      copies = Zold::Copies.new(dir, log: test_log)
+      copies.add('broken wallet content', 'zold.io', 4096, 10, Time.now)
+      copies.clean
+      assert(copies.all.empty?, "#{copies.all.count} is not empty")
+    end
+  end
+
   def test_ignores_garbage
     Dir.mktmpdir 'test' do |dir|
-      copies = Zold::Copies.new(dir)
-      copies.add('h1', 'zold.io', 50, 80, Time.now - 25 * 60 * 60)
+      copies = Zold::Copies.new(dir, log: test_log)
+      copies.add(content('h1'), 'zold.io', 50, 80, Time.now - 25 * 60 * 60)
       FileUtils.mkdir(File.join(dir, '55'))
       assert_equal(1, copies.all.count)
     end
@@ -85,20 +97,33 @@ class TestCopies < Minitest::Test
 
   def test_sorts_them_by_score
     Dir.mktmpdir 'test' do |dir|
-      copies = Zold::Copies.new(dir)
-      copies.add('content-1', '1.zold.io', 80, 1)
-      copies.add('content-2', '2.zold.io', 80, 2)
-      copies.add('content-3', '3.zold.io', 80, 50)
-      copies.add('content-4', '4.zold.io', 80, 3)
+      copies = Zold::Copies.new(dir, log: test_log)
+      copies.add(content('content-1'), '1.zold.io', 80, 1)
+      copies.add(content('content-2'), '2.zold.io', 80, 2)
+      copies.add(content('content-3'), '3.zold.io', 80, 50)
+      copies.add(content('content-4'), '4.zold.io', 80, 3)
       assert_equal('50 3 2 1', copies.all.map { |c| c[:score] }.join(' '))
     end
   end
 
   def test_ignores_too_old_scores
     Dir.mktmpdir 'test' do |dir|
-      copies = Zold::Copies.new(dir)
-      copies.add('h1', 'zold.io', 50, 80, Time.now - 1000 * 60 * 60)
+      copies = Zold::Copies.new(dir, log: test_log)
+      copies.add(content('h1'), 'zold.io', 50, 80, Time.now - 1000 * 60 * 60)
       assert_equal(0, copies.all[0][:score])
     end
   end
+
+  private
+
+  def content(text)
+    id = Zold::Id.new('aaaabbbbccccdddd')
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet(id)
+      amount = Zold::Amount.new(zld: 1.99)
+      key = Zold::Key.new(file: 'fixtures/id_rsa')
+      wallet.sub(amount, "NOPREFIX@#{id}", key, text)
+      File.read(wallet.path)
+    end
+  end
 end

data/test/test_wallet.rb

@@ -47,6 +47,19 @@ class TestWallet < Minitest::Test
     end
   end
 
+  def test_refurbishes_wallet
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      amount = Zold::Amount.new(zld: 5.99)
+      key = Zold::Key.new(file: 'fixtures/id_rsa')
+      wallet.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
+      wallet.sub(amount, "NOPREFIX@#{Zold::Id.new}", key)
+      File.write(wallet.path, File.read(wallet.path) + "\n\n\n")
+      wallet.refurbish
+      assert_equal(amount * -2, wallet.balance)
+    end
+  end
+
   def test_positive_transactions_go_first
     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.3
+  version: 0.14.4
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-10 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby