zold-stress 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c39b360cbbeb1dedfc3aaddeca4ce31c6f84e0f3e73d3311ec801d2923457646
-  data.tar.gz: eaf7ae9f9ce95a3d3faa9ecbdf5393d684e405e8c1deaa00c3489d59698bf874
+  metadata.gz: 6ab86a1ae25c81f4ac5fb1c98279b618dbfaa977e926a3c760b13d06b53ad2fb
+  data.tar.gz: a20be8604c929d4b371db76655a176c3a3973941e9e79e7f2fed9defdc260a2a
 SHA512:
-  metadata.gz: f3cdc01c10cddea9defba0449ff31a57b2696e3efffe63cf0302ae65a10f3c905d05f867965411785ac17d9ccad187e5de097fe87f2daf96b702dd09e309e9a6
-  data.tar.gz: 5e6174df13026e203f57ec777f419377c7154929ec0022e0da73da35e591fba96aff138faefc7b2a6c607334bb7caa0f9f3fcb52eb8b10a43fe1383ad3c27a21
+  metadata.gz: 706d9e39efaac93346011db9869cbb83c45dc9c2ef8d22dee3382faa2dd7f790e8cd917ed0b9793ff21ddfd996d5f429cab9915d6ef69a058d4274736165592e
+  data.tar.gz: 3debbc344aaaa1d5a3841bc407c9d7bb323df226c8bb94c25be04e39bab22e9acdaf6ac1946e4c7ac3d30ba626cdc4fd7ea6f347408a5aeb524199569f541d8f

data/.rultor.yml

@@ -1,6 +1,8 @@
 assets:
   rubygems.yml: zerocracy/home#assets/rubygems.yml
 install: |-
+  sudo apt-get -y update
+  sudo apt-get -y install libcurl4-openssl-dev
   sudo gem install zold
   zold --version
   export GEM_HOME=~/.ruby

data/bin/zold-stress

@@ -121,7 +121,6 @@ Available options:"
     stats: stats, air: air, log: log, vlog: vlog, opts: opts
   )
 
-  log.info("Zold version: #{Zold::VERSION}")
   log.info("Time: #{Time.now.utc.iso8601}; CPUs: #{Concurrent.processor_count}")
   log.info("Home directory: #{home}")
   log.info("Ruby version: #{RUBY_VERSION}/#{RUBY_PLATFORM}")

data/lib/zold/stress/pmnts.rb

@@ -54,7 +54,7 @@ module Zold::Stress
         File.write(f, @pvt.to_s)
         loop do
           source = all.sample
-          balance = @wallets.find(source, &:balance)
+          balance = @wallets.acq(source, &:balance)
           next if balance.negative? || balance.zero?
           amount = balance / all.count
           next if amount < Zold::Amount.new(zld: 0.0001)
@@ -79,7 +79,7 @@ module Zold::Stress
           "--private-key=#{pvt}", '--ignore-nodes-absence'
         ]
       )
-      if @wallets.find(source) { |w| Zold::Tax.new(w).in_debt? }
+      if @wallets.acq(source) { |w| Zold::Tax.new(w).in_debt? }
         @log.error("The wallet #{source} is in debt and we can't pay taxes")
         return
       end

data/lib/zold/stress/pool.rb

@@ -51,7 +51,7 @@ module Zold::Stress
     def rebuild
       raise "There are no wallets in the pool at #{@wallets.path}, at least one is needed" if @wallets.all.empty?
       balances = @wallets.all
-        .map { |id| { id: id, balance: @wallets.find(id, &:balance) } }
+        .map { |id| { id: id, balance: @wallets.acq(id, &:balance) } }
         .sort_by { |h| h[:balance] }
         .reverse
       balances.last([balances.count - @opts['pool'], 0].max).each do |h|
@@ -60,7 +60,7 @@ module Zold::Stress
         )
       end
       Tempfile.open do |f|
-        File.write(f, @wallets.find(balances[0][:id], &:key).to_s)
+        File.write(f, @wallets.acq(balances[0][:id], &:key).to_s)
         while @wallets.all.count < @opts['pool']
           Zold::Create.new(wallets: @wallets, log: @vlog).run(
             ['create', "--public-key=#{f.path}", "--network=#{@opts['network']}"] + @opts.arguments

data/lib/zold/stress/round.rb

@@ -81,7 +81,7 @@ module Zold::Stress
         end
       end
       @log.info("There are #{@wallets.all.count} wallets in the pool \
-with #{@wallets.all.map { |id| @wallets.find(id, &:balance) }.inject(&:+)} total, \
+with #{@wallets.all.map { |id| @wallets.acq(id, &:balance) }.inject(&:+)} total, \
 in #{Zold::Age.new(start)}")
     end
 
@@ -102,7 +102,7 @@ in #{Zold::Age.new(start)}")
           mutex.synchronize do
             a[1].each { |p| @air.add(p) }
           end
-          @stats.put('output', @wallets.find(a[0], &:size))
+          @stats.put('output', @wallets.acq(a[0], &:size))
         end
       end
       @log.info("#{sent.count} payments for #{sent.map { |s| s[:amount] }.inject(&:+)} \
@@ -122,7 +122,7 @@ in #{Zold::Age.new(start)}, #{@air.fetch.count} are now in the air, \
           )
         end
         @air.pulled(id)
-        @stats.put('input', @wallets.find(id, &:size))
+        @stats.put('input', @wallets.acq(id, &:size))
       end
       @log.info("There are #{@wallets.all.count} wallets left, \
 after the pull of #{targets.count} in #{Zold::Age.new(start)}")
@@ -131,8 +131,8 @@ after the pull of #{targets.count} in #{Zold::Age.new(start)}")
     def match
       total = 0
       @air.fetch.each do |p|
-        next unless @wallets.find(p[:target], &:exists?)
-        t = @wallets.find(p[:target], &:txns).find { |x| x.details == p[:details] && x.bnf == p[:source] }
+        next unless @wallets.acq(p[:target], &:exists?)
+        t = @wallets.acq(p[:target], &:txns).find { |x| x.details == p[:details] && x.bnf == p[:source] }
         next if t.nil?
         @stats.put('arrived', p[:pulled] - p[:pushed])
         total += 1

data/lib/zold/stress/summary.rb

@@ -48,7 +48,7 @@ module Zold::Stress
         "#{tps.round(2)} tps",
         %w[update push pull paid arrived].map do |m|
           if @stats.exists?(m)
-            t = "#{m}: #{@stats.total(m)}/#{Zold::Age.new(Time.now - @stats.avg(m), limit: 1)}"
+            t = "#{m}: #{@stats.total(m)}/#{Zold::Age.new(Time.now - @stats.avg(m), limit: 2)}"
             errors = @stats.total(m + '_error')
             t += errors.zero? ? '' : '/' + Rainbow(errors.to_s).red
             t

data/test/zold/stress/fake_node.rb

@@ -72,8 +72,8 @@ module Zold::Stress
           end
           attempt = 0
           loop do
-            code = Zold::Http.new(uri: "http://localhost:#{port}/").get.code
-            break if code == '200'
+            code = Zold::Http.new(uri: "http://localhost:#{port}/").get.status
+            break if code == 200
             @log.debug("Waiting for the node at localhost:#{port} (attempt no.#{attempt}): #{code}...")
             attempt += 1
             sleep 1

data/test/zold/stress/test_pmnts.rb

@@ -61,8 +61,8 @@ class PmntsTest < Minitest::Test
       assert_equal(1, sent.count)
       assert_equal(id, sent[0][:source])
       assert_equal(Zold::Id::ROOT, sent[0][:target])
-      assert_equal(Zold::Amount.new(zld: 3.5), wallets.find(id, &:balance))
-      assert_equal(Zold::Amount.new(zld: -3.5), wallets.find(Zold::Id::ROOT, &:balance))
+      assert_equal(Zold::Amount.new(zld: 3.5), wallets.acq(id, &:balance))
+      assert_equal(Zold::Amount.new(zld: -3.5), wallets.acq(Zold::Id::ROOT, &:balance))
     end
   end
 
@@ -75,7 +75,7 @@ class PmntsTest < Minitest::Test
         id = Zold::Create.new(wallets: wallets, log: test_log).run(
           ['create', '--public-key=fixtures/id_rsa.pub', Zold::Id.new.to_s, '--network=test']
         )
-        wallets.find(id) do |w|
+        wallets.acq(id) do |w|
           w.add(Zold::Txn.new(1, Time.now, Zold::Amount.new(zld: 1.0), 'NOPREFIX', Zold::Id.new, '-'))
         end
         ids << id
@@ -89,7 +89,7 @@ class PmntsTest < Minitest::Test
         log: test_log, vlog: test_log
       ).send
       assert_equal(20, sent.count)
-      assert_equal(46, wallets.all.map { |id| wallets.find(id) { |w| w.txns.count } }.inject(&:+))
+      assert_equal(46, wallets.all.map { |id| wallets.acq(id) { |w| w.txns.count } }.inject(&:+))
     end
   end
 end

data/test/zold/stress/test_pool.rb

@@ -43,7 +43,7 @@ class PoolTest < Minitest::Test
         Zold::Create.new(wallets: wallets, log: test_log).run(
           ['create', '--public-key=fixtures/id_rsa.pub', Zold::Id::ROOT.to_s, '--network=test']
         )
-        wallets.find(Zold::Id::ROOT) do |w|
+        wallets.acq(Zold::Id::ROOT) do |w|
           w.add(Zold::Txn.new(1, Time.now, Zold::Amount.new(zld: 1.0), 'NOPREFIX', Zold::Id.new, '-'))
         end
         remotes = Zold::Remotes.new(file: File.join(home, 'remotes'), network: 'test')

data/test/zold/stress/test_round.rb

@@ -55,7 +55,7 @@ class StressTest < Minitest::Test
         Zold::Create.new(wallets: wallets, log: test_log).run(
           ['create', '--public-key=fixtures/id_rsa.pub', Zold::Id::ROOT.to_s, '--network=test']
         )
-        wallets.find(Zold::Id::ROOT) do |w|
+        wallets.acq(Zold::Id::ROOT) do |w|
           w.add(Zold::Txn.new(1, Time.now, Zold::Amount.new(zld: 1.0), 'NOPREFIX', Zold::Id.new, '-'))
         end
         stats = Zold::Stress::Stats.new

data/zold-stress.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '2.2'
   s.required_ruby_version = '>=2.3'
   s.name = 'zold-stress'
-  s.version = '0.5.0'
+  s.version = '0.5.1'
   s.license = 'MIT'
   s.summary = 'Zold stress test'
   s.description = 'Stress testing toolkit for Zold network'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold-stress
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2018-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace