refactor(client): update MPCClient initialization to use ClientID directly in options

vietddude · vietddude · commit 94b4d38d02d3 · 2026-03-24T18:44:41.000+07:00
diff --git a/e2e/base_test.go b/e2e/base_test.go
@@ -196,7 +196,8 @@ func (s *E2ETestSuite) SetupMPCClient(t *testing.T) {
 	mpcClient := client.NewMPCClient(client.Options{
 		NatsConn: s.natsConn,
 		Signer:   localSigner,
-	}, client.WithClientID("e2e-suite"))
+		ClientID: "e2e-suite",
+	})
 	s.mpcClient = mpcClient
 	t.Log("MPC client created")
 }
diff --git a/e2e/multi_client_routing_test.go b/e2e/multi_client_routing_test.go
@@ -170,7 +170,8 @@ func newScopedMPCClient(t *testing.T, suite *E2ETestSuite, clientID string) (cli
 	mpcClient := client.NewMPCClient(client.Options{
 		NatsConn: natsConn,
 		Signer:   signer,
-	}, client.WithClientID(clientID))
+		ClientID: clientID,
+	})
 
 	return mpcClient, natsConn
 }
diff --git a/examples/authorizers/generate/main.go b/examples/authorizers/generate/main.go
@@ -90,7 +90,8 @@ func main() {
 	mpcClient := client.NewMPCClient(client.Options{
 		NatsConn: natsConn,
 		Signer:   localSigner,
-	}, client.WithClientID(*clientID))
+		ClientID: *clientID,
+	})
 
 	var walletStartTimes sync.Map
 	var walletIDs []string
diff --git a/examples/authorizers/sign/main.go b/examples/authorizers/sign/main.go
@@ -84,7 +84,8 @@ func main() {
 	mpcClient := client.NewMPCClient(client.Options{
 		NatsConn: natsConn,
 		Signer:   localSigner,
-	}, client.WithClientID(*clientID))
+		ClientID: *clientID,
+	})
 
 	// Create a signing request with authorizers
 	txID := uuid.New().String()
diff --git a/examples/ckd/main.go b/examples/ckd/main.go
@@ -67,7 +67,8 @@ func main() {
 	mpcClient := client.NewMPCClient(client.Options{
 		NatsConn: natsConn,
 		Signer:   localSigner,
-	}, client.WithClientID(*clientID))
+		ClientID: *clientID,
+	})
 
 	// 2) Once wallet exists, immediately fire a SignTransaction
 	txID := uuid.New().String()
diff --git a/examples/generate/kms/main.go b/examples/generate/kms/main.go
@@ -66,7 +66,8 @@ func main() {
 	mpcClient := client.NewMPCClient(client.Options{
 		NatsConn: natsConn,
 		Signer:   kmsSigner,
-	}, client.WithClientID(*clientID))
+		ClientID: *clientID,
+	})
 
 	var walletStartTimes sync.Map
 	var walletIDs []string
diff --git a/examples/generate/main.go b/examples/generate/main.go
@@ -73,7 +73,8 @@ func main() {
 	mpcClient := client.NewMPCClient(client.Options{
 		NatsConn: natsConn,
 		Signer:   localSigner,
-	}, client.WithClientID(*clientID))
+		ClientID: *clientID,
+	})
 
 	var walletStartTimes sync.Map
 	var walletIDs []string
diff --git a/examples/hdwallet/ecdsa/main.go b/examples/hdwallet/ecdsa/main.go
@@ -97,7 +97,8 @@ func main() {
 	mpcClient := client.NewMPCClient(client.Options{
 		NatsConn: natsConn,
 		Signer:   localSigner,
-	}, client.WithClientID(*clientID))
+		ClientID: *clientID,
+	})
 
 	// Step 1: Generate ONE master wallet
 	fmt.Println("Step 1: Generating master MPC wallet...")
diff --git a/examples/hdwallet/eddsa/main.go b/examples/hdwallet/eddsa/main.go
@@ -100,7 +100,8 @@ func main() {
 	mpcClient := client.NewMPCClient(client.Options{
 		NatsConn: natsConn,
 		Signer:   localSigner,
-	}, client.WithClientID(*clientID))
+		ClientID: *clientID,
+	})
 
 	// Step 1: Generate ONE master wallet
 	fmt.Println("Step 1: Generating master MPC wallet...")
diff --git a/examples/reshare/main.go b/examples/reshare/main.go
@@ -67,7 +67,8 @@ func main() {
 	mpcClient := client.NewMPCClient(client.Options{
 		NatsConn: natsConn,
 		Signer:   localSigner,
-	}, client.WithClientID(*clientID))
+		ClientID: *clientID,
+	})
 
 	// 3) Listen for signing results
 	err = mpcClient.OnResharingResult(func(evt event.ResharingResultEvent) {
diff --git a/examples/sign/main.go b/examples/sign/main.go
@@ -67,7 +67,8 @@ func main() {
 	mpcClient := client.NewMPCClient(client.Options{
 		NatsConn: natsConn,
 		Signer:   localSigner,
-	}, client.WithClientID(*clientID))
+		ClientID: *clientID,
+	})
 
 	// 2) Once wallet exists, immediately fire a SignTransaction
 	txID := uuid.New().String()
diff --git a/pkg/client/client.go b/pkg/client/client.go
@@ -44,12 +44,9 @@ type Options struct {
 
 	// Signer for signing messages
 	Signer Signer
-}
-
-type ClientOption func(*clientConfig)
 
-type clientConfig struct {
-	clientID string
+	// ClientID optionally scopes result routing for this client instance.
+	ClientID string
 }
 
 type clientResultRouting struct {
@@ -61,24 +58,13 @@ type clientResultRouting struct {
 	reshareSubject      string
 }
 
-func WithClientID(id string) ClientOption {
-	return func(cfg *clientConfig) {
-		cfg.clientID = id
-	}
-}
-
 // NewMPCClient creates a new MPC client using the provided options.
 // The signer must be provided to handle message signing.
-func NewMPCClient(opts Options, clientOptions ...ClientOption) MPCClient {
+func NewMPCClient(opts Options) MPCClient {
 	if opts.Signer == nil {
 		logger.Fatal("Signer is required", nil)
 	}
-
-	cfg := clientConfig{}
-	for _, opt := range clientOptions {
-		opt(&cfg)
-	}
-	if err := validateClientID(cfg.clientID); err != nil {
+	if err := validateClientID(opts.ClientID); err != nil {
 		logger.Fatal("Invalid client ID", err)
 	}
 
@@ -109,7 +95,7 @@ func NewMPCClient(opts Options, clientOptions ...ClientOption) MPCClient {
 	pubsub := messaging.NewNATSPubSub(opts.NatsConn)
 
 	manager := messaging.NewNATsMessageQueueManager("mpc", event.ResultStreamSubjects(), opts.NatsConn)
-	routing := buildClientResultRouting(cfg.clientID)
+	routing := buildClientResultRouting(opts.ClientID)
 
 	genKeySuccessQueue := manager.NewMessageQueue(routing.keygenConsumerName, routing.keygenSubject)
 	signResultQueue := manager.NewMessageQueue(routing.signingConsumerName, routing.signingSubject)
@@ -123,7 +109,7 @@ func NewMPCClient(opts Options, clientOptions ...ClientOption) MPCClient {
 		signResultQueue:     signResultQueue,
 		reshareSuccessQueue: reshareSuccessQueue,
 		signer:              opts.Signer,
-		clientID:            cfg.clientID,
+		clientID:            opts.ClientID,
 	}
 }
 
diff --git a/scripts/check-client-routing/main.go b/scripts/check-client-routing/main.go

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,8 @@ func newScopedMPCClient(t testing.T, suite E2ETestSuite, clientID string) (cli`
`170`	`170`	`mpcClient := client.NewMPCClient(client.Options{`
`171`	`171`	`NatsConn: natsConn,`
`172`	`172`	`Signer: signer,`
`173`		`- }, client.WithClientID(clientID))`
	`173`	`+ ClientID: clientID,`
	`174`	`+ })`
`174`	`175`
`175`	`176`	`return mpcClient, natsConn`
`176`	`177`	`}`