go/worker: Use ProtocolID helper to avoid duplication

martintomazic · martintomazic · commit e5be01047bed · 2025-08-06T12:20:37.000+02:00
diff --git a/go/worker/common/p2p/txsync/client.go b/go/worker/common/p2p/txsync/client.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/oasisprotocol/oasis-core/go/common"
 	"github.com/oasisprotocol/oasis-core/go/common/crypto/hash"
-	"github.com/oasisprotocol/oasis-core/go/p2p/protocol"
 	"github.com/oasisprotocol/oasis-core/go/p2p/rpc"
 )
 
@@ -82,7 +81,7 @@ func (c *client) GetTxs(ctx context.Context, request *GetTxsRequest) (*GetTxsRes
 
 // NewClient creates a new transaction sync protocol client.
 func NewClient(p2p rpc.P2P, chainContext string, runtimeID common.Namespace) Client {
-	pid := protocol.NewRuntimeProtocolID(chainContext, runtimeID, TxSyncProtocolID, TxSyncProtocolVersion)
+	pid := ProtocolID(chainContext, runtimeID)
 	mgr := rpc.NewPeerManager(p2p, pid)
 	rc := rpc.NewClient(p2p.Host(), pid)
 	rc.RegisterListener(mgr)
diff --git a/go/worker/common/p2p/txsync/protocol.go b/go/worker/common/p2p/txsync/protocol.go
@@ -47,7 +47,7 @@ func init() {
 
 			protocols := make([]core.ProtocolID, len(n.Runtimes))
 			for i, rt := range n.Runtimes {
-				protocols[i] = protocol.NewRuntimeProtocolID(chainContext, rt.ID, TxSyncProtocolID, TxSyncProtocolVersion)
+				protocols[i] = ProtocolID(chainContext, rt.ID)
 			}
 
 			return protocols
diff --git a/go/worker/keymanager/p2p/client.go b/go/worker/keymanager/p2p/client.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/oasisprotocol/oasis-core/go/common"
 	p2p "github.com/oasisprotocol/oasis-core/go/p2p/api"
-	"github.com/oasisprotocol/oasis-core/go/p2p/protocol"
 	"github.com/oasisprotocol/oasis-core/go/p2p/rpc"
 )
 
@@ -46,7 +45,7 @@ func (c *client) CallEnclave(ctx context.Context, request *CallEnclaveRequest, p
 
 // NewClient creates a new keymanager protocol client.
 func NewClient(p2p p2p.Service, chainContext string, keymanagerID common.Namespace) Client {
-	pid := protocol.NewRuntimeProtocolID(chainContext, keymanagerID, KeyManagerProtocolID, KeyManagerProtocolVersion)
+	pid := ProtocolID(chainContext, keymanagerID)
 	mgr := rpc.NewPeerManager(p2p, pid)
 	rc := rpc.NewClient(p2p.Host(), pid)
 	rc.RegisterListener(mgr)
diff --git a/go/worker/keymanager/p2p/protocol.go b/go/worker/keymanager/p2p/protocol.go
@@ -50,7 +50,7 @@ func init() {
 
 			protocols := make([]core.ProtocolID, len(n.Runtimes))
 			for i, rt := range n.Runtimes {
-				protocols[i] = protocol.NewRuntimeProtocolID(chainContext, rt.ID, KeyManagerProtocolID, KeyManagerProtocolVersion)
+				protocols[i] = ProtocolID(chainContext, rt.ID)
 			}
 
 			return protocols
diff --git a/go/worker/storage/p2p/checkpointsync/client.go b/go/worker/storage/p2p/checkpointsync/client.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/oasisprotocol/oasis-core/go/common"
 	"github.com/oasisprotocol/oasis-core/go/common/crypto/hash"
-	"github.com/oasisprotocol/oasis-core/go/p2p/protocol"
 	"github.com/oasisprotocol/oasis-core/go/p2p/rpc"
 	"github.com/oasisprotocol/oasis-core/go/storage/mkvs/checkpoint"
 )
@@ -111,7 +110,7 @@ func (c *client) GetCheckpointChunk(
 //
 // Moreover, it ensures underlying p2p service starts tracking protocol peers.
 func NewClient(p2p rpc.P2P, chainContext string, runtimeID common.Namespace) Client {
-	pid := protocol.NewRuntimeProtocolID(chainContext, runtimeID, CheckpointSyncProtocolID, CheckpointSyncProtocolVersion)
+	pid := ProtocolID(chainContext, runtimeID)
 	rc := rpc.NewClient(p2p.Host(), pid)
 	mgr := rpc.NewPeerManager(p2p, pid)
 	rc.RegisterListener(mgr)
diff --git a/go/worker/storage/p2p/checkpointsync/protocol.go b/go/worker/storage/p2p/checkpointsync/protocol.go
@@ -71,7 +71,7 @@ func init() {
 
 			protocols := make([]core.ProtocolID, len(n.Runtimes))
 			for i, rt := range n.Runtimes {
-				protocols[i] = protocol.NewRuntimeProtocolID(chainContext, rt.ID, CheckpointSyncProtocolID, CheckpointSyncProtocolVersion)
+				protocols[i] = ProtocolID(chainContext, rt.ID)
 			}
 
 			return protocols
diff --git a/go/worker/storage/p2p/diffsync/client.go b/go/worker/storage/p2p/diffsync/client.go
@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/oasisprotocol/oasis-core/go/common"
-	"github.com/oasisprotocol/oasis-core/go/p2p/protocol"
 	"github.com/oasisprotocol/oasis-core/go/p2p/rpc"
 )
 
@@ -44,7 +43,7 @@ func (c *client) GetDiff(ctx context.Context, request *GetDiffRequest) (*GetDiff
 //
 // Moreover, it ensures underlying p2p service starts tracking protocol peers.
 func NewClient(p2p rpc.P2P, chainContext string, runtimeID common.Namespace) Client {
-	pid := protocol.NewRuntimeProtocolID(chainContext, runtimeID, DiffSyncProtocolID, DiffSyncProtocolVersion)
+	pid := ProtocolID(chainContext, runtimeID)
 	rc := rpc.NewClient(p2p.Host(), pid)
 	mgr := rpc.NewPeerManager(p2p, pid)
 	rc.RegisterListener(mgr)
diff --git a/go/worker/storage/p2p/diffsync/protocol.go b/go/worker/storage/p2p/diffsync/protocol.go
@@ -52,7 +52,7 @@ func init() {
 
 			protocols := make([]core.ProtocolID, len(n.Runtimes))
 			for i, rt := range n.Runtimes {
-				protocols[i] = protocol.NewRuntimeProtocolID(chainContext, rt.ID, DiffSyncProtocolID, DiffSyncProtocolVersion)
+				protocols[i] = ProtocolID(chainContext, rt.ID)
 			}
 
 			return protocols
diff --git a/go/worker/storage/p2p/pub/client.go b/go/worker/storage/p2p/pub/client.go
@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/oasisprotocol/oasis-core/go/common"
-	"github.com/oasisprotocol/oasis-core/go/p2p/protocol"
 	"github.com/oasisprotocol/oasis-core/go/p2p/rpc"
 )
 
@@ -64,7 +63,7 @@ func (c *client) Iterate(ctx context.Context, request *IterateRequest) (*ProofRe
 
 // NewClient creates a new storage pub protocol client.
 func NewClient(p2p rpc.P2P, chainContext string, runtimeID common.Namespace) Client {
-	pid := protocol.NewRuntimeProtocolID(chainContext, runtimeID, StoragePubProtocolID, StoragePubProtocolVersion)
+	pid := ProtocolID(chainContext, runtimeID)
 	mgr := rpc.NewPeerManager(p2p, pid)
 	rc := rpc.NewClient(p2p.Host(), pid)
 	rc.RegisterListener(mgr)
diff --git a/go/worker/storage/p2p/pub/protocol.go b/go/worker/storage/p2p/pub/protocol.go
@@ -58,7 +58,7 @@ func init() {
 
 			protocols := make([]core.ProtocolID, len(n.Runtimes))
 			for i, rt := range n.Runtimes {
-				protocols[i] = protocol.NewRuntimeProtocolID(chainContext, rt.ID, StoragePubProtocolID, StoragePubProtocolVersion)
+				protocols[i] = ProtocolID(chainContext, rt.ID)
 			}
 
 			return protocols
diff --git a/go/worker/storage/p2p/synclegacy/client.go b/go/worker/storage/p2p/synclegacy/client.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/oasisprotocol/oasis-core/go/common"
 	"github.com/oasisprotocol/oasis-core/go/common/crypto/hash"
-	"github.com/oasisprotocol/oasis-core/go/p2p/protocol"
 	"github.com/oasisprotocol/oasis-core/go/p2p/rpc"
 	"github.com/oasisprotocol/oasis-core/go/storage/mkvs/checkpoint"
 )
@@ -129,7 +128,7 @@ func NewClient(p2p rpc.P2P, chainContext string, runtimeID common.Namespace) Cli
 	// Use two separate clients and managers for the same protocol. This is to make sure that peers
 	// are scored differently between the two use cases (syncing diffs vs. syncing checkpoints). We
 	// could consider separating this into two protocols in the future.
-	pid := protocol.NewRuntimeProtocolID(chainContext, runtimeID, StorageSyncProtocolID, StorageSyncProtocolVersion)
+	pid := ProtocolID(chainContext, runtimeID)
 
 	rcC := rpc.NewClient(p2p.Host(), pid)
 	mgrC := rpc.NewPeerManager(p2p, pid)
diff --git a/go/worker/storage/p2p/synclegacy/protocol.go b/go/worker/storage/p2p/synclegacy/protocol.go
@@ -92,7 +92,7 @@ func init() {
 
 			protocols := make([]core.ProtocolID, len(n.Runtimes))
 			for i, rt := range n.Runtimes {
-				protocols[i] = protocol.NewRuntimeProtocolID(chainContext, rt.ID, StorageSyncProtocolID, StorageSyncProtocolVersion)
+				protocols[i] = ProtocolID(chainContext, rt.ID)
 			}
 
 			return protocols

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func init() {`
`47`	`47`
`48`	`48`	`protocols := make([]core.ProtocolID, len(n.Runtimes))`
`49`	`49`	`for i, rt := range n.Runtimes {`
`50`		`- protocols[i] = protocol.NewRuntimeProtocolID(chainContext, rt.ID, TxSyncProtocolID, TxSyncProtocolVersion)`
	`50`	`+ protocols[i] = ProtocolID(chainContext, rt.ID)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`return protocols`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func init() {`
`50`	`50`
`51`	`51`	`protocols := make([]core.ProtocolID, len(n.Runtimes))`
`52`	`52`	`for i, rt := range n.Runtimes {`
`53`		`- protocols[i] = protocol.NewRuntimeProtocolID(chainContext, rt.ID, KeyManagerProtocolID, KeyManagerProtocolVersion)`
	`53`	`+ protocols[i] = ProtocolID(chainContext, rt.ID)`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`return protocols`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func init() {`
`71`	`71`
`72`	`72`	`protocols := make([]core.ProtocolID, len(n.Runtimes))`
`73`	`73`	`for i, rt := range n.Runtimes {`
`74`		`- protocols[i] = protocol.NewRuntimeProtocolID(chainContext, rt.ID, CheckpointSyncProtocolID, CheckpointSyncProtocolVersion)`
	`74`	`+ protocols[i] = ProtocolID(chainContext, rt.ID)`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`return protocols`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func init() {`
`52`	`52`
`53`	`53`	`protocols := make([]core.ProtocolID, len(n.Runtimes))`
`54`	`54`	`for i, rt := range n.Runtimes {`
`55`		`- protocols[i] = protocol.NewRuntimeProtocolID(chainContext, rt.ID, DiffSyncProtocolID, DiffSyncProtocolVersion)`
	`55`	`+ protocols[i] = ProtocolID(chainContext, rt.ID)`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`return protocols`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func init() {`
`58`	`58`
`59`	`59`	`protocols := make([]core.ProtocolID, len(n.Runtimes))`
`60`	`60`	`for i, rt := range n.Runtimes {`
`61`		`- protocols[i] = protocol.NewRuntimeProtocolID(chainContext, rt.ID, StoragePubProtocolID, StoragePubProtocolVersion)`
	`61`	`+ protocols[i] = ProtocolID(chainContext, rt.ID)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`return protocols`