Merge branch 'feature/marketplace-api' of https://github.com/mesg-fou…

…ndation/core into feature/marketplace-api

database/service_db.go

@@ -178,6 +178,12 @@ func (d *LevelDBServiceDB) Save(s *service.Service) error {
 		return err
 	}
 
+	// delete existent service that has the same sid.
+	if err := d.delete(tx, s.Sid); err != nil && !IsErrNotFound(err) {
+		tx.Discard()
+		return err
+	}
+
 	// encode service
 	b, err := d.marshal(s)
 	if err != nil {

database/service_db_test.go

@@ -42,13 +42,13 @@ func TestServiceDBSave(t *testing.T) {
 	s2 := &service.Service{Hash: "01", Sid: "1", Name: "test-service"}
 	require.NoError(t, db.Save(s2))
 	_, err := db.Get(s1.Hash)
-	require.NoError(t, err)
+	require.IsType(t, &ErrNotFound{}, err)
 
 	// different hash, different sid. should not replace anything.
 	s3 := &service.Service{Hash: "02", Sid: "2", Name: "test-service"}
 	require.NoError(t, db.Save(s3))
 	ss, _ = db.All()
-	require.Len(t, ss, 3)
+	require.Len(t, ss, 2)
 
 	// test service without hash.
 	s := &service.Service{Name: "test-service", Sid: "Sid"}
@@ -192,3 +192,23 @@ func TestIsErrNotFound(t *testing.T) {
 	require.True(t, IsErrNotFound(&ErrNotFound{}))
 	require.False(t, IsErrNotFound(nil))
 }
+
+// Test to check behavior of one sid "has one" hash and ony hash "belongs to" one sid
+// This test can be replaced/deleted when we implement sid "has many" hashes
+func TestPairHashSid(t *testing.T) {
+	db, closer := openServiceDB(t)
+	defer closer()
+
+	s1 := &service.Service{Hash: "00", Sid: "Sid1"}
+	s2 := &service.Service{Hash: "01", Sid: "Sid1"}
+
+	require.NoError(t, db.Save(s1))
+	require.NoError(t, db.Save(s2))
+	defer db.Delete(s1.Hash)
+	defer db.Delete(s2.Hash)
+	_, err := db.Get(s1.Hash)
+	require.Error(t, err)
+	s, err := db.Get(s2.Hash)
+	require.NoError(t, err)
+	require.Equal(t, s.Hash, s2.Hash)
+}

dev-core

@@ -24,7 +24,7 @@ for i in systemservices/* ; do
     echo "Creating archive for $i..."
     cd $i
     file=$(basename "$i")
-    tar -czf ../../tmp-systemservices/$file.tar.gz *
+    tar -czf ../../tmp-systemservices/$file.tar.gz --exclude-from=.dockerignore .
     varname="$(tr '[:lower:]' '[:upper:]' <<< ${file:0:1})${file:1}"
     LDFLAGS+=" -X 'github.com/mesg-foundation/core/config.${varname}URL=http://$MESG_SERVICE_SERVER/$file.tar.gz'"
     cd ../..

systemservices/marketplace/mesg.yml

@@ -3,7 +3,7 @@ sid: marketplace
 description: ""
 configuration:
   env:
-    - PROVIDER_ENDPOINT=https://ropsten.infura.io
+    - PROVIDER_ENDPOINT=https://ropsten.infura.io/v3/6115ae2531f64c04a9a392cf500e5fbe
     - BLOCK_CONFIRMATIONS=0
     - DEFAULT_GAS=1000000
     - POLLING_TIME=1000