fix: prevent gateway signer

initializeing into market client
ipfs-force-community · Jul 13, 2022 · 9fd4b9e · 9fd4b9e
1 parent 57985f4
commit 9fd4b9e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 21 deletions.
diff --git a/api/clients/modules.go b/api/clients/modules.go
@@ -57,7 +57,7 @@ var ClientsOpts = func(server bool, mode string, mCfg *config.Messager, signerCf
 			func(s *builder.Settings) bool {
 				return len(signerCfg.SignerType) > 0 && len(signerCfg.Url) > 0
 			},
-			builder.Override(new(ISinger), NewISignerClient),
+			builder.Override(new(ISinger), NewISignerClient(server)),
 			builder.Override(ReplaceWalletMethod, ConvertWalletToISinge),
 		),
 	)

diff --git a/api/clients/sign_client.go b/api/clients/sign_client.go
@@ -48,28 +48,35 @@ type SignerParams struct {
 	Mgr       minermgr.IAddrMgr `optional:"true"`
 }
 
-func NewISignerClient(mctx metrics.MetricsCtx, lc fx.Lifecycle, params SignerParams) (ISinger, error) {
-	var signer ISinger
-	var closer jsonrpc.ClientCloser
-	var err error
-	switch params.SignerCfg.SignerType {
-	case config.SignerTypeWallet:
-		signer, closer, err = newWalletClient(context.Background(), params.SignerCfg.Token, params.SignerCfg.Url)
-	case config.SignerTypeGateway:
-		signer, closer, err = newGatewayWalletClient(context.Background(), params.Mgr, params.SignerCfg)
-	default:
-		return nil, fmt.Errorf("unsupport sign type %s", params.SignerCfg.SignerType)
-	}
+func NewISignerClient(isServer bool) func(metrics.MetricsCtx, fx.Lifecycle, SignerParams) (ISinger, error) {
 
-	lc.Append(fx.Hook{
-		OnStop: func(_ context.Context) error {
-			if closer != nil {
-				closer()
+	return func(mctx metrics.MetricsCtx, lc fx.Lifecycle, params SignerParams) (ISinger, error) {
+		var signer ISinger
+		var closer jsonrpc.ClientCloser
+		var err error
+		switch params.SignerCfg.SignerType {
+		case config.SignerTypeWallet:
+			signer, closer, err = newWalletClient(context.Background(), params.SignerCfg.Token, params.SignerCfg.Url)
+		case config.SignerTypeGateway:
+			if !isServer {
+				return nil, fmt.Errorf("gateway signer not supported in client mode")
 			}
-			return nil
-		},
-	})
-	return signer, err
+			signer, closer, err = newGatewayWalletClient(context.Background(), params.Mgr, params.SignerCfg)
+		default:
+			return nil, fmt.Errorf("unsupport sign type %s", params.SignerCfg.SignerType)
+		}
+
+		lc.Append(fx.Hook{
+			OnStop: func(_ context.Context) error {
+				if closer != nil {
+					closer()
+				}
+				return nil
+			},
+		})
+		return signer, err
+	}
+
 }
 
 func newWalletClient(ctx context.Context, token, url string) (*WalletClient, jsonrpc.ClientCloser, error) {