Remove the grpc.CallOption field from ordered RPCs

The field was not actually used for anything. Removing it required some changes to the template variables though, as one-way calls and RPCs do not have the same dependencies.
relab · Jul 20, 2020 · 85ea364 · 85ea364
1 parent 1765679
commit 85ea364
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/cmd/protoc-gen-gorums/dev/zorums_ordered_gorums.pb.go b/cmd/protoc-gen-gorums/dev/zorums_ordered_gorums.pb.go
diff --git a/cmd/protoc-gen-gorums/gengorums/template_ordered_qc.go b/cmd/protoc-gen-gorums/gengorums/template_ordered_qc.go
@@ -5,6 +5,10 @@ var orderingVariables = `
 {{$unexportMethod := unexport .Method.GoName}}
 `
 
+var orderedRPCVariables = orderingVariables + `
+{{$context := use "context.Context" .GenFile}}
+`
+
 var orderedQCSignature = `func (c *Configuration) {{$method}}(` +
 	`ctx {{$context}}, in *{{$in}}` +
 	`{{perNodeFnType .GenFile .Method ", f"}})` +
@@ -85,8 +89,7 @@ var orderingReply = `
 `
 
 var orderingQC = commonVariables +
-	quorumCallVariables +
-	orderingVariables +
+	orderedRPCVariables +
 	quorumCallComment +
 	orderedQCSignature +
 	orderingPreamble +

diff --git a/cmd/protoc-gen-gorums/gengorums/template_ordered_rpc.go b/cmd/protoc-gen-gorums/gengorums/template_ordered_rpc.go
@@ -3,8 +3,7 @@ package gengorums
 var orderingRPCComment = `{{.Method.Comments.Leading}}`
 
 var orderingRPCSignature = `func (n *Node) {{$method}}(` +
-	`ctx {{$context}}, in *{{$in}}, ` +
-	`opts ...{{$opts}})` +
+	`ctx {{$context}}, in *{{$in}}) ` +
 	`(resp *{{$out}}, err error) {
 `
 
@@ -42,8 +41,7 @@ var orderingRPCBody = `
 `
 
 var orderingRPC = commonVariables +
-	quorumCallVariables +
-	orderingVariables +
+	orderedRPCVariables +
 	orderingRPCComment +
 	orderingRPCSignature +
 	orderingRPCPreamble +

diff --git a/examples/storage/proto/storage_gorums.pb.go b/examples/storage/proto/storage_gorums.pb.go