Fix e2e unmonitoring test

Signed-off-by: AndreyM <[email protected]>
mysteriumnetwork · May 31, 2023 · 7a2c48e · 7a2c48e
1 parent 8d78a8f
commit 7a2c48e
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 9 deletions.
diff --git a/cmd/main.go b/cmd/main.go
@@ -79,7 +79,6 @@ func main() {
 
 	proposalsAPI := proposal.NewAPI(
 		proposalService,
-		proposalRepo,
 		locationProvider,
 		cfg.ProposalsCacheTTL,
 		cfg.ProposalsCacheLimit,

diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
@@ -9,7 +9,8 @@ services:
     environment:
       - PORT=8080
       - QUALITY_ORACLE_URL=http://wiremock:8080
-      - QUALITY_CACHE_TTL=20s
+      - QUALITY_CACHE_TTL=1s
+      - PROPOSALS_CACHE_TTL=0s
       - BADGER_ADDRESS=http://wiremock:8080
       - BROKER_URL=nats://broker
       - LOCATION_ADDRESS=http://wiremock:8080

diff --git a/e2e/proposals_test.go b/e2e/proposals_test.go
@@ -167,8 +167,8 @@ func Test_ProposalFiltering(t *testing.T) {
 		err := newTemplate().providerID(providerID).publishPing()
 		assert.NoError(t, err)
 		assert.Eventuallyf(t, func() bool {
-			proposals, err := api.ListFilters(Query{ProviderID: []string{"notMockedInWiremock"}})
-			return len(proposals) == 1 && proposals[0].ProviderID == providerID && err == nil
+			proposals, err := api.ListFilters(Query{ProviderID: []string{"notMockedInWiremock"}, ServiceType: "openvpn"})
+			return len(proposals) == 0 && err == nil
 		}, time.Second*5, time.Millisecond*200, "proposal %s was not returned", providerID)
 	})
 }

diff --git a/e2e/templates.go b/e2e/templates.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 
 	v3 "github.com/mysteriumnetwork/discovery/proposal/v3"
-	"github.com/prometheus/common/log"
 )
 
 type template struct {
@@ -38,7 +37,6 @@ func (t *template) compatibility(c int) *template {
 }
 
 func (t *template) publishPing() error {
-	log.Infof("Publishing ping: %v", t.proposalMessage)
 	err := defaultBroker.PublishPingOneV2(*t.proposalMessage)
 	if err != nil {
 		return err

diff --git a/listener/proposal.go b/listener/proposal.go
@@ -65,7 +65,6 @@ func (l *Listener) Listen() error {
 	}
 
 	if _, err := conn.Subscribe("*.proposal-ping.v3", func(msg *nats.Msg) {
-		// log.Info().Msgf("Received a message [%s] %s", msg.Subject, string(msg.Data))
 		pingMsg := v3.ProposalPingMessage{}
 		if err := json.Unmarshal(msg.Data, &pingMsg); err != nil {
 			log.Err(err).Msg("Failed to parse proposal")

diff --git a/proposal/api.go b/proposal/api.go
@@ -32,7 +32,6 @@ type locationProvider interface {
 }
 
 func NewAPI(service *Service,
-	repository *Repository,
 	location locationProvider,
 	proposalsCacheTTL time.Duration,
 	proposalsCacheLimit int,

diff --git a/proposal/v3/proposal.go b/proposal/v3/proposal.go
@@ -27,7 +27,7 @@ func (p ProposalUnregisterMessage) IsEmpty() bool {
 }
 
 func (p ProposalUnregisterMessage) Key() string {
-	return p.Proposal.ServiceType + ":" + p.Proposal.ProviderID
+	return p.Proposal.ProviderID + "." + p.Proposal.ServiceType
 }
 
 const Format = "service-proposal/v2"