Merge pull request #453 from fairDataSociety/0.9.3-rc2

disable sub manager

Author: asabya

cmd/dfs/cmd/server.go

@@ -206,8 +206,8 @@ can consume it.`,
 
 		ctx, cancel := context.WithCancel(cmd.Context())
 		defer cancel()
-		// datadir will be removed in some future version. it is kept for migration purpose only
-		hdlr, err := api.New(ctx, beeApi, cookieDomain, postageBlockId, corsOrigins, ensConfig, subscriptionConfig, logger)
+
+		hdlr, err := api.New(ctx, beeApi, cookieDomain, postageBlockId, corsOrigins, ensConfig, nil, logger)
 		if err != nil {
 			logger.Error(err.Error())
 			return err

pkg/contracts/config.go

@@ -25,11 +25,7 @@ func TestnetConfig() (*ENSConfig, *SubscriptionConfig) {
 		PublicResolverAddress: "0xbfeCC6c32B224F7D0026ac86506Fe40A9607BD14",
 		ProviderDomain:        "fds",
 	}
-
-	s := &SubscriptionConfig{
-		DataHubAddress: "0xBE41b272e3cDe3aeC8fE4a144C5b7cE71D9e6498",
-	}
-	return e, s
+	return e, nil
 }
 
 // PlayConfig defines the configuration for fdp-play

pkg/dfs/pod_api.go

@@ -687,13 +687,23 @@ func (a *API) GetSubscribablePodInfo(sessionId string, subHash [32]byte) (*rpc.S
 	if ui == nil {
 		return nil, ErrUserNotLoggedIn
 	}
-
+	if a.sm == nil {
+		return nil, errNilSubManager
+	}
 	return a.sm.GetSubscribablePodInfo(subHash)
 }
 
 // OpenSubscribedPod
 func (a *API) OpenSubscribedPod(sessionId string, subHash [32]byte, infoLocation string) (*pod.Info, error) {
+	// get the loggedin user information
+	ui := a.users.GetLoggedInUserInfo(sessionId)
+	if ui == nil {
+		return nil, ErrUserNotLoggedIn
+	}
 
+	if a.sm == nil {
+		return nil, errNilSubManager
+	}
 	sub, err := a.sm.GetSub(subHash)
 	if err != nil {
 		return nil, err
@@ -706,12 +716,6 @@ func (a *API) OpenSubscribedPod(sessionId string, subHash [32]byte, infoLocation
 		return nil, err
 	}
 
-	// get the loggedin user information
-	ui := a.users.GetLoggedInUserInfo(sessionId)
-	if ui == nil {
-		return nil, ErrUserNotLoggedIn
-	}
-
 	// open the pod
 	pi, err := ui.GetPod().OpenSubscribedPodFromReference(infoLocation, ownerPublicKey)
 	if err != nil {
@@ -733,7 +737,9 @@ func (a *API) GetSubscribablePods(sessionId string) ([]datahub.DataHubSub, error
 	if ui == nil {
 		return nil, ErrUserNotLoggedIn
 	}
-
+	if a.sm == nil {
+		return nil, errNilSubManager
+	}
 	return ui.GetPod().GetMarketplace()
 }
 
@@ -744,6 +750,8 @@ func (a *API) GetSubsRequests(sessionId string) ([]datahub.DataHubSubRequest, er
 	if ui == nil {
 		return nil, ErrUserNotLoggedIn
 	}
-
+	if a.sm == nil {
+		return nil, errNilSubManager
+	}
 	return ui.GetPod().GetSubRequests()
 }

wasm/main.go

@@ -113,37 +113,30 @@ func connect(_ js.Value, funcArgs []js.Value) interface{} {
 	handler := js.FuncOf(func(_ js.Value, args []js.Value) interface{} {
 		resolve := args[0]
 		reject := args[1]
-		if len(funcArgs) != 6 {
-			reject.Invoke("not enough arguments. \"connect(beeEndpoint, stampId, rpc, network, subRpc, subContractAddress)\"")
+		if len(funcArgs) != 4 {
+			reject.Invoke("not enough arguments. \"connect(beeEndpoint, stampId, rpc, network)\"")
 			return nil
 		}
 		beeEndpoint := funcArgs[0].String()
 		stampId := funcArgs[1].String()
 		rpc := funcArgs[2].String()
 		network := funcArgs[3].String()
-		subRpc := funcArgs[4].String()
-		subContractAddress := funcArgs[5].String()
+		//subRpc := funcArgs[4].String()
+		//subContractAddress := funcArgs[5].String()
 		if network != "testnet" && network != "play" {
 			reject.Invoke("unknown network. \"use play or testnet\"")
 			return nil
 		}
 		var (
-			config    *contracts.ENSConfig
-			subConfig *contracts.SubscriptionConfig
+			config *contracts.ENSConfig
 		)
 
 		if network == "play" {
-			config, subConfig = contracts.PlayConfig()
+			config, _ = contracts.PlayConfig()
 		} else {
-			config, subConfig = contracts.TestnetConfig()
+			config, _ = contracts.TestnetConfig()
 		}
 		config.ProviderBackend = rpc
-		if subRpc != "" {
-			subConfig.RPC = subRpc
-		}
-		if subContractAddress != "" {
-			subConfig.DataHubAddress = subContractAddress
-		}
 		logger := logging.New(os.Stdout, logrus.DebugLevel)
 
 		go func() {
@@ -152,7 +145,7 @@ func connect(_ js.Value, funcArgs []js.Value) interface{} {
 				beeEndpoint,
 				stampId,
 				config,
-				subConfig,
+				nil,
 				logger,
 			)
 			if err != nil {