fabric-gateway 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51017a36a52c447bd52777486b764ddc09fcfc1c19bca1943da465c49cbc4294
-  data.tar.gz: 52e5b9b209eb53cfe246c4a41b9f7d91d1abee940162cc9c23599f75d0c0e6b0
+  metadata.gz: 440a8fa889f826b8b34b4036566bfe969a9daac00f38e5ee3a0898a815a85be5
+  data.tar.gz: bb959422d092506445984a7a1b6370a290febf6c01b1edfaecbfc6e2b82da5f2
 SHA512:
-  metadata.gz: e8f61a0b72d738c832c48bbdc56b4c4aa182802e9f892eb12c701b755ff158c560e106aca0ce914e411fca58a322139d6ebd8ee09c7cf921d6ab671322912f8d
-  data.tar.gz: 63b48fe7fa040153d0142f537fe6d73a7285c0d7652d5e73901df816101c536108ade11f438918c69eabbb0c43a8fdd5d594b015b8140dea4d8b5208e79d3c29
+  metadata.gz: b44c4324907688d7049a48a018d245812ee3f563ade9707fc52742c41f35f618f05442a1bfe442f1d0efa02be7fc4aca258edee70bbd698b3a4da01683568484
+  data.tar.gz: eea0cfad7d97571c24da1eeec72958bafc737f90c6a9f808a657adb50faca2312a15ce8b227ac8db6385f9fe7a31f01e9e157c999065b8ed95973788dbaf5cdd

data/README.md

@@ -22,14 +22,6 @@ Or install it yourself as:
 
     $ gem install fabric-gateway
 
-### ISSUES
-
-Note, there is an issue with the grpc library for MacOS (https://github.com/grpc/grpc/issues/28271). It results in a segfault in ruby when trying to make a connection. 
-
-Workaround: Either run on linux or use a docker container as a workaround.
-
-Will update to new version of grpc when fix is released.
-
 ## Usage
 
 This is a beta stage library with all the main hyperledger gateway calls implemented. Although this library has good unit test coverage, it is fairly new and has not yet been run in production environments. The library will be updated to 1.0.0 when the library has proven to be stable.
@@ -56,7 +48,7 @@ client_opts = {
     GRPC::Core::Channel::SSL_TARGET => 'peer0.org1.example.com'
   }
 }
-# optional, if you want to set deadlines to the individual calls (in seconds)
+# optional, if you want to set an absolute deadline for each of the individual calls (in seconds)
 default_call_options = {
   endorse_options: { deadline: GRPC::Core::TimeConsts.from_relative_time(5) },
   evaluate_options: { deadline: GRPC::Core::TimeConsts.from_relative_time(5) },
@@ -64,6 +56,16 @@ default_call_options = {
   commit_status_options: { deadline: GRPC::Core::TimeConsts.from_relative_time(5) },
   chaincode_events_options: { deadline: GRPC::Core::TimeConsts.from_relative_time(60) }
 }
+
+# for a relative time from when the call is made, pass an integer instead of a GRPC::Core::TimeConsts (still in seconds)
+default_call_options = {
+  endorse_options: { deadline: 5 },
+  evaluate_options: { deadline: 5 },
+  submit_options: { deadline: 5 },
+  commit_status_options: { deadline: 5 },
+  chaincode_events_options: { deadline: 60 }
+}
+
 creds = GRPC::Core::ChannelCredentials.new(load_certs[0])
 client=Fabric::Client.new(host: 'localhost:7051', creds: creds, default_call_options: default_call_options, **client_opts)
 

data/lib/fabric/client.rb

@@ -60,7 +60,7 @@ module Fabric
     # @return [Gateway::EvaluateResponse] evaluate_response
     #
     def evaluate(evaluate_request, options = {})
-      @grpc_client.evaluate(evaluate_request, @default_call_options[:evaluate_options].merge(options))
+      @grpc_client.evaluate(evaluate_request, final_call_options(:evaluate, options))
     end
 
     #
@@ -72,7 +72,7 @@ module Fabric
     # @return [Gateway::EndorseResponse] endorse_response
     #
     def endorse(endorse_request, options = {})
-      @grpc_client.endorse(endorse_request, @default_call_options[:endorse_options].merge(options))
+      @grpc_client.endorse(endorse_request, final_call_options(:endorse, options))
     end
 
     #
@@ -84,7 +84,7 @@ module Fabric
     # @return [Gateway::SubmitResponse] submit_response
     #
     def submit(submit_request, options = {})
-      @grpc_client.submit(submit_request, @default_call_options[:submit_options].merge(options))
+      @grpc_client.submit(submit_request, final_call_options(:submit, options))
     end
 
     #
@@ -97,7 +97,7 @@ module Fabric
     # @return [Gateway::CommitStatusResponse] commit_status_response
     #
     def commit_status(commit_status_request, options = {})
-      @grpc_client.commit_status(commit_status_request, @default_call_options[:commit_status_options].merge(options))
+      @grpc_client.commit_status(commit_status_request, final_call_options(:commit_status, options))
     end
 
     #
@@ -164,7 +164,7 @@ module Fabric
     #
     def chaincode_events(chaincode_events_request, options = {}, &block)
       @grpc_client.chaincode_events(chaincode_events_request,
-                                    @default_call_options[:chaincode_events_options].merge(options), &block)
+                                    final_call_options(:chaincode_events, options), &block)
     end
 
     private
@@ -195,5 +195,13 @@ module Fabric
       @default_call_options[:commit_status_options] ||= {}
       @default_call_options[:chaincode_events_options] ||= {}
     end
+
+    def final_call_options(call_type, call_options)
+      options = @default_call_options["#{call_type}_options".to_sym].merge(call_options || {})
+      if (deadline = options[:deadline]) && !(deadline.is_a? Time)
+        options[:deadline] = GRPC::Core::TimeConsts.from_relative_time(deadline)
+      end
+      options
+    end
   end
 end

data/lib/fabric/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fabric
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fabric-gateway
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Jonathan Chan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-25 00:00:00.000000000 Z
+date: 2022-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf