Merge branch 'dev' into fix/protofile-generation

mesg-foundation · Jan 16, 2019 · e0608bc · e0608bc
2 parents 8447155 + 2932959
commit e0608bc
Show file tree

Hide file tree

Showing 551 changed files with 8 additions and 377,099 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -6,7 +6,6 @@ run:
     - commands/provider/assets/
     - protobuf/
     - service/importer/assets/
-    - systemservices/sources/resolver/proto/
 
 linters-settings:
   govet:

diff --git a/systemservices/deployer/deployer_test.go b/systemservices/deployer/deployer_test.go
@@ -57,9 +57,11 @@ func TestNotExisting(t *testing.T) {
 
 // TODO: Should have a mock on API in order to convert this integration test to unit test
 func TestDeploy(t *testing.T) {
-	d, closer := newDeployer(t)
-	defer closer()
-	err := d.Deploy([]string{systemservices.ResolverService})
+	t.SkipNow()
+	// TODO: add test back with another ss
+	// d, closer := newDeployer(t)
+	// defer closer()
+	// err := d.Deploy([]string{systemservices.ResolverService})
 	// TODO: should stop the deployed ss
-	require.NoError(t, err)
+	// require.NoError(t, err)
 }
diff --git a/systemservices/resolver/resolver.go b/systemservices/resolver/resolver.go
diff --git a/systemservices/sources/resolver/.circleci/config.yml b/systemservices/sources/resolver/.circleci/config.yml
diff --git a/systemservices/sources/resolver/Dockerfile b/systemservices/sources/resolver/Dockerfile
diff --git a/systemservices/sources/resolver/Gopkg.lock b/systemservices/sources/resolver/Gopkg.lock
diff --git a/systemservices/sources/resolver/Gopkg.toml b/systemservices/sources/resolver/Gopkg.toml