drpcwire: add back KindCancel for soft cancel support

Change-Id: I285f9bd31b7fb1d3d20b7f4421e822d482afa421
storj · Nov 3, 2022 · 8ad4620 · 8ad4620
1 parent f550f63
commit 8ad4620
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 23 deletions.
diff --git a/drpcwire/README.md b/drpcwire/README.md
@@ -152,6 +152,9 @@ const (
 	// with a code attached.
 	KindError Kind = 3
 
+	// KindCancel is sent to notify the remote that we have soft canceled.
+	KindCancel Kind = 4
+
 	// KindClose is used to inform that the rpc is dead. It has no body.
 	KindClose Kind = 5
 

diff --git a/drpcwire/fuzz_test.go b/drpcwire/fuzz_test.go
@@ -1,6 +1,3 @@
-//go:build gofuzzbeta
-// +build gofuzzbeta
-
 // Copyright (C) 2021 Storj Labs, Inc.
 // See LICENSE for copying information.
 

diff --git a/drpcwire/packet.go b/drpcwire/packet.go
@@ -14,9 +14,6 @@ const (
 	// kindReserved is saved for the future in case we need to extend.
 	//   kindReserved Kind = 0
 
-	// kindCancelDeprecated is a reminder that we once used this kind value.
-	//   kindCancelDeprecated Kind = 4
-
 	// KindInvoke is used to invoke an rpc. The body is the name of the rpc.
 	KindInvoke Kind = 1
 
@@ -27,6 +24,9 @@ const (
 	// with a code attached.
 	KindError Kind = 3
 
+	// KindCancel is sent to notify the remote that we have soft canceled.
+	KindCancel Kind = 4
+
 	// KindClose is used to inform that the rpc is dead. It has no body.
 	KindClose Kind = 5
 

diff --git a/drpcwire/packet_string.go b/drpcwire/packet_string.go
diff --git a/drpcwire/rand_test.go b/drpcwire/rand_test.go
@@ -60,6 +60,7 @@ var payloadSize = map[Kind]func() int{
 	KindInvoke:         func() int { return rand.Intn(1023) + 1 },
 	KindMessage:        func() int { return rand.Intn(1023) + 1 },
 	KindError:          func() int { return rand.Intn(1023) + 1 },
+	KindCancel:         func() int { return 0 },
 	KindClose:          func() int { return 0 },
 	KindCloseSend:      func() int { return 0 },
 	KindInvokeMetadata: func() int { return rand.Intn(1023) + 1 },