diff --git a/lib/hive/block_api.rb b/lib/hive/block_api.rb index b77e2b62eedc17f175c0cb886501c9413b39eac4..1d442e7ff2393136ad40b56d4a33ba3191d6b0cc 100644 --- a/lib/hive/block_api.rb +++ b/lib/hive/block_api.rb @@ -52,7 +52,7 @@ module Hive if !!block index = 0 - @rpc_client.rpc_batch_execute(request_object: request_object) do |result, error, id| + @rpc_client.rpc_batch_execute(api_name: self.class.api_name, request_object: request_object) do |result, error, id| block_num = sub_range.to_a[index] index = index + 1 @@ -66,7 +66,7 @@ module Hive else blocks = [] - @rpc_client.rpc_batch_execute(request_object: request_object) do |result, error, id| + @rpc_client.rpc_batch_execute(api_name: self.class.api_name, request_object: request_object) do |result, error, id| blocks << result end end diff --git a/lib/hive/jsonrpc.rb b/lib/hive/jsonrpc.rb index f35c014392fd76e3d112fbe04c7e7e2d213dbc99..9b56c034a7cfd6e43fc759b9f5bd7b040e53c09b 100644 --- a/lib/hive/jsonrpc.rb +++ b/lib/hive/jsonrpc.rb @@ -90,7 +90,7 @@ module Hive end for request_object in chunks do - @rpc_client.rpc_batch_execute(request_object: request_object) do |result, error, id| + @rpc_client.rpc_batch_execute(api_name: self.class.api_name, request_object: request_object) do |result, error, id| api, method = method_map[id] api = api.to_sym method = method.to_sym diff --git a/test/hive/account_history_api_test.rb b/test/hive/account_history_api_test.rb index 1801a3eb26094071fbe2d4f28b6e228a0bc2638f..65c29e9881151107c1eda57b23b570de9ceb666a 100644 --- a/test/hive/account_history_api_test.rb +++ b/test/hive/account_history_api_test.rb @@ -63,7 +63,7 @@ module Hive } @api.get_transaction(options) do |result| - assert_equal Hashie::Array, result.history.class + assert_equal Hashie::Mash, result.class end end end diff --git a/test/hive/jsonrpc_test.rb b/test/hive/jsonrpc_test.rb index e93412534e3aab7a2c5a1af008a1bc748c9151ae..d9e217b318b3810f3b0c2109e082006e27578edf 100644 --- a/test/hive/jsonrpc_test.rb +++ b/test/hive/jsonrpc_test.rb @@ -299,7 +299,9 @@ module Hive assert_raises SocketError, Errno::ECONNREFUSED do jsonrpc = Jsonrpc.new(url: 'https://bad.node') jsonrpc.get_methods + # :nocov: fail 'regression detected, SocketError or Errno::ECONNREFUSED expected' + # :nocov: end end end diff --git a/test/hive/stream_test.rb b/test/hive/stream_test.rb index 57959f81db902211e85849d8bc7a48266c031fbc..ded5379ae084052dc27f92050396f7a49cafb8f4 100644 --- a/test/hive/stream_test.rb +++ b/test/hive/stream_test.rb @@ -138,6 +138,7 @@ module Hive end def test_operations_by_deprecated_type + votes_found = false options = { until_block_num: @last_irreversible_block_num + 1, types: :vote @@ -148,7 +149,11 @@ module Hive assert op assert trx_id assert block_num + + votes_found = true end + + fail 'no vote ops found' unless votes_found end end @@ -187,4 +192,4 @@ module Hive end end end -end \ No newline at end of file +end