Remove core space pub/sub client usage (#215)

Conflux-Chain · Aug 8, 2024 · e55c5df · e55c5df
1 parent c52f7b5
commit e55c5df
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 14 deletions.
diff --git a/cmd/util/data_context.go b/cmd/util/data_context.go
@@ -75,7 +75,6 @@ type SyncContext struct {
 	StoreContext
 
 	SyncCfx *sdk.Client
-	SubCfx  *sdk.Client
 	SyncEth *web3go.Client
 }
 
@@ -84,7 +83,6 @@ func MustInitSyncContext(storeCtx StoreContext) SyncContext {
 
 	if storeCtx.CfxDB != nil || storeCtx.CfxCache != nil {
 		sc.SyncCfx = rpc.MustNewCfxClientFromViper(rpc.WithClientHookMetrics(true))
-		sc.SubCfx = rpc.MustNewCfxWsClientFromViper()
 	}
 
 	if storeCtx.EthDB != nil {
@@ -102,10 +100,6 @@ func (ctx *SyncContext) Close() {
 		ctx.SyncCfx.Close()
 	}
 
-	if ctx.SubCfx != nil {
-		ctx.SubCfx.Close()
-	}
-
 	if ctx.SyncEth != nil {
 		ctx.SyncEth.Close()
 	}

diff --git a/config/config.yml b/config/config.yml
@@ -48,8 +48,6 @@ ethrpc:
 
 # Core space SDK client configurations
 cfx:
-  # Fullnode websocket endpoint
-  ws: ws://test.confluxrpc.com/ws
   # Fullnode HTTP endpoint
   http: http://test.confluxrpc.com
   # Retry times if failure, if 0 never

diff --git a/util/rate/registry.go b/util/rate/registry.go
@@ -114,7 +114,7 @@ func (r *Registry) genDefaultGroupAndKey(
 
 	stg, ok := r.strategies[DefaultStrategy]
 	if !ok { // no default strategy
-		logrus.WithField("resource", resource).Info("Default strategy not configured")
+		logrus.WithField("resource", resource).Debug("Default rate limit strategy not configured")
 		return
 	}
 

diff --git a/util/rpc/client_cfx.go b/util/rpc/client_cfx.go
@@ -41,10 +41,6 @@ func MustNewCfxClientFromViper(options ...ClientOption) *sdk.Client {
 	return MustNewCfxClient(cfxClientCfg.Http, options...)
 }
 
-func MustNewCfxWsClientFromViper(options ...ClientOption) *sdk.Client {
-	return MustNewCfxClient(cfxClientCfg.WS, options...)
-}
-
 func MustNewCfxClient(url string, options ...ClientOption) *sdk.Client {
 	cfx, err := NewCfxClient(url, options...)
 	if err != nil {

diff --git a/util/rpc/config.go b/util/rpc/config.go
@@ -19,7 +19,6 @@ type circuitBreakerConfig struct {
 }
 
 type clientConfig struct {
-	WS              string
 	Http            string
 	Retry           int
 	RetryInterval   time.Duration `default:"1s"`