fix: update provider storage

arkeonetwork · Oct 28, 2024 · ec5dc35 · ec5dc35
1 parent 9fd0129
commit ec5dc35
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/sentinel/event_stream.go b/sentinel/event_stream.go
@@ -334,7 +334,7 @@ func (p Proxy) handleBondProviderEvent(result tmCoreTypes.ResultEvent) {
 	if !p.isMyPubKey(evt.Provider) {
 		return
 	}
-	providerConfig, err := p.ProviderConfigStore.Get(evt.Provider)
+	providerConfig, err := p.ProviderConfigStore.Get(evt.Provider, service.String())
 	if err != nil {
 		p.logger.Info("failed to get provider config, initializing new config", "error", err)
 		providerConfig = ProviderConfiguration{
@@ -381,7 +381,7 @@ func (p Proxy) handleModProviderEvent(result tmCoreTypes.ResultEvent) {
 		return
 	}
 
-	providerConfig, err := p.ProviderConfigStore.Get(evt.Provider)
+	providerConfig, err := p.ProviderConfigStore.Get(evt.Provider, service.String())
 	if err != nil {
 		p.logger.Error(fmt.Sprintf("failed to get provider %s", err))
 		return

diff --git a/sentinel/provider_store.go b/sentinel/provider_store.go
@@ -59,8 +59,8 @@ type ProviderConfiguration struct {
 }
 
 // GetProviderModOrBondConfig retrieves a ProviderConfiguration by its PubKey
-func (ps *ProviderConfigurationStore) Get(pubKey common.PubKey) (ProviderConfiguration, error) {
-	data, err := ps.db.Get([]byte(pubKey.String()), nil)
+func (ps *ProviderConfigurationStore) Get(pubKey common.PubKey, service string) (ProviderConfiguration, error) {
+	data, err := ps.db.Get([]byte(pubKey.String()+service), nil)
 	if err != nil {
 		return ProviderConfiguration{}, err
 	}
@@ -80,13 +80,13 @@ func (ps *ProviderConfigurationStore) Set(config ProviderConfiguration) error {
 		return err
 	}
 
-	err = ps.db.Put([]byte(config.PubKey.String()), data, nil)
+	err = ps.db.Put([]byte(config.PubKey.String()+config.Service.String()), data, nil)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func (p *ProviderConfigurationStore) Remove(key common.PubKey) error {
-	return p.db.Delete([]byte(key.String()), nil)
+func (p *ProviderConfigurationStore) Remove(pubKey common.PubKey, service string) error {
+	return p.db.Delete([]byte(pubKey.String()+service), nil)
 }
diff --git a/sentinel/provider_store_test.go b/sentinel/provider_store_test.go
@@ -53,7 +53,7 @@ func TestProviderConfigurationStore_SetAndGet(t *testing.T) {
 	err = store.Set(config)
 	require.NoError(t, err, "expected no error when setting provider config")
 
-	retrievedConfig, err := store.Get(pubKey)
+	retrievedConfig, err := store.Get(pubKey, service.String())
 	require.NoError(t, err, "expected no error when getting provider config")
 	require.Equal(t, config, retrievedConfig, "expected the stored and retrieved configs to be the same")
 
@@ -85,10 +85,10 @@ func TestProviderConfigurationStore_Remove(t *testing.T) {
 	err = store.Set(config)
 	require.NoError(t, err, "expected no error when setting provider config")
 
-	err = store.Remove(pubKey)
+	err = store.Remove(pubKey, service.String())
 	require.NoError(t, err, "expected no error when removing provider config")
 
-	_, err = store.Get(pubKey)
+	_, err = store.Get(pubKey, service.String())
 	require.Error(t, err, "expected error when getting non-existent provider config")
 
 	err = store.db.Close()

diff --git a/sentinel/routes.go b/sentinel/routes.go
@@ -6,5 +6,5 @@ const (
 	RoutesClaim          = "/claim/{id}"
 	RoutesOpenClaims     = "/open-claims"
 	RouteManage          = "/manage/contract/{id}"
-	RouteProviderData    = "/provider"
+	RouteProviderData    = "/provider/{service}"
 )
diff --git a/sentinel/sentinel.go b/sentinel/sentinel.go
@@ -467,8 +467,15 @@ func respondWithJSON(w http.ResponseWriter, code int, payload interface{}) {
 
 func (p Proxy) handleProviderData(w http.ResponseWriter, r *http.Request) {
 	r.Header.Set("Content-Type", "application/json")
+	vars := mux.Vars(r)
+	serviceString, ok := vars["service"]
+	if !ok {
+		respondWithError(w, "missing service in uri", http.StatusBadRequest)
+		return
+	}
+	service := common.Service(common.ServiceLookup[serviceString])
 
-	providerConfigData, err := p.ProviderConfigStore.Get(p.Config.ProviderPubKey)
+	providerConfigData, err := p.ProviderConfigStore.Get(p.Config.ProviderPubKey, service.String())
 	if err != nil {
 		p.logger.Error("failed to get provider details", "error", err, "provider", p.Config.ProviderPubKey)
 		respondWithError(w, fmt.Sprintf("Invalid Provider: %s", err), http.StatusBadRequest)