Merge branch 'staging' into remove-zproxy

Author: cnlangzi

.github/workflows/tests.yml

@@ -60,60 +60,3 @@ jobs:
  files: ./code/go/0chain.net/coverage.txt
  flags: Unit-Tests
  verbose: true
- 
- integration-tests:
- name: Integration Tests
- runs-on: [self-hosted,docker-builds]
- timeout-minutes: 40
- steps:
- - name: Setup go 1.18
- uses: actions/setup-go@v2
- with:
- go-version: '1.18' # The Go version to download (if necessary) and use.
-
- # - uses: actions/cache@v2
- # with:
- # path: ~/go/pkg/mod
- # key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- # restore-keys: |
- # ${{ runner.os }}-go-
-
- - name: Clone Blobber
- uses: actions/checkout@v2
-
- - name: Install Postgres
- run: |
- ./docker.local/bin/blobber.init.setup.sh
- cd docker.local/blobber1
- ../bin/blobber.start_github.sh
- docker ps
- - name: Run Tests
- run: |
- echo ===============[ kill blobber instance ]====================
- sudo apt-get update -y
- sudo apt-get install lsof -y
- 
- ps aux | grep blobber
- 
- n=$(sudo lsof -i tcp:35051 | grep -v PID | wc -l)
- [ $n -gt 0 ] && sudo kill -9 $(lsof -i tcp:35051 | awk '{print $2}' | grep -v PID) && echo "> killed running blobber for integration-tests" || echo "> no blobber is running for integration-tests"
-
- echo ""
- make local-build
- sudo make local-run &
- sleep 15
- running=0
- echo ===============[ checking blobber status ]====================
- for i in {1..10} 
- do
- echo "[$i/10] checking blobber status"
- curl 127.0.0.1:25051 && break || sleep 2
- done
-
- echo ===============[ run tests ]====================
- #sudo make integration-tests 
- go=$(which go)
- root=$(pwd)
- sudo CGO_ENABLED=1 root=$root integration=1 $go test -tags bn256 -tags=integration ./...
-
- sudo pkill -9 blobber

Makefile

@@ -22,10 +22,6 @@ lint:
 golangci-lint run --timeout 2m0s;
 
 
-.PHONY: integration-tests
-integration-tests:
-CGO_ENABLED=1 root=$(ROOT) integration=1 go test -p 1 -tags bn256 ./...
-
 .PHONY: local-init
 local-init:
 @echo "=========================[ init blobber ]========================="
@@ -50,7 +46,7 @@ local-build: local-init
 .PHONY: local-run
 local-run: 
 @echo "=========================[ run blobber ]========================="
-cd ./dev.local/ && integration=1 ./data/blobber/blobber \
+cd ./dev.local/ && ./data/blobber/blobber \
 --port 25051 \
 --grpc_port 35051 \
 --hostname 127.0.0.1 \

code/go/0chain.net/blobber/config.go

@@ -78,11 +78,7 @@ func setupConfig(configDir string, deploymentMode int) {
 
 config.Configuration.PGUserName = viper.GetString("pg.user")
 config.Configuration.PGPassword = viper.GetString("pg.password")
-if isIntegrationTest {
-config.Configuration.DBHost = "localhost"
-} else {
-config.Configuration.DBHost = viper.GetString("db.host")
-}
+config.Configuration.DBHost = viper.GetString("db.host")
 config.Configuration.DBName = viper.GetString("db.name")
 config.Configuration.DBPort = viper.GetString("db.port")
 config.Configuration.DBUserName = viper.GetString("db.user")

code/go/0chain.net/blobber/filestore.go

@@ -8,13 +8,7 @@ import (
 
 func setupFileStore() (err error) {
 fmt.Print("> setup file store")
-var fs filestore.FileStorer
-if isIntegrationTest {
-fs = &filestore.MockStore{}
-} else {
-fs = &filestore.FileStore{}
-
-}
+fs := &filestore.FileStore{}
 
 err = fs.Initialize()
 if err != nil {

code/go/0chain.net/blobber/flags.go

@@ -3,25 +3,23 @@ package main
 import (
 "flag"
 "fmt"
-"os"
 )
 
 var (
-deploymentMode int
-keysFile string
-minioFile string
-mountPoint string
-metadataDB string
-logDir string
-httpPort int
-hostname string
-configDir string
-grpcPort int
-isIntegrationTest bool
-httpsPort int
-httpsKeyFile string
-httpsCertFile string
-hostUrl string
+deploymentMode int
+keysFile string
+minioFile string
+mountPoint string
+metadataDB string
+logDir string
+httpPort int
+hostname string
+configDir string
+grpcPort int
+httpsPort int
+httpsKeyFile string
+httpsCertFile string
+hostUrl string
 )
 
 func init() {
@@ -58,7 +56,6 @@ func parseFlags() {
 if httpPort <= 0 && httpsPort <= 0 {
 panic("Please specify --port or --https-port which is the port on which requests are accepted")
 }
-isIntegrationTest = os.Getenv("integration") == "1"
 
 if httpsPort > 0 && (httpsCertFile == "" || httpsKeyFile == "") {
 panic("Please specify --https-cert-file and --https-key-file if you are using --https-port")

code/go/0chain.net/blobber/grpc.go

@@ -1,6 +1,3 @@
-//go:build !integration_tests
-// +build !integration_tests
-
 package main
 
 import (

code/go/0chain.net/blobber/main.go

@@ -39,8 +39,9 @@ func main() {
 panic(err)
 }
 
-// only enabled with "// +build integration_tests"
-initIntegrationsTests(node.Self.ID)
+// prepare is to configure more.
+// when enabled "// +build integration_tests", this sets blobber for conductor tests.
+prepareBlobber(node.Self.ID)
 
 if err := registerOnChain(); err != nil {
 logging.Logger.Error("Error register on blockchain" + err.Error())

code/go/0chain.net/blobber/integration_tests.go renamed to code/go/0chain.net/blobber/prepare_conductor_testing.go

@@ -1,6 +1,9 @@
 //go:build integration_tests
 // +build integration_tests
 
+// Integration tests is also called conductor tests.
+// TODO. There seems to be missing setup for conductor as only prepareBlobber() is hooked.
+
 package main
 
 import (
@@ -10,13 +13,11 @@ import (
 )
 
 // start lock, where the miner is ready to connect to blockchain (BC)
-func initIntegrationsTests(id string) {
+func prepareBlobber(id string) {
 logging.Logger.Info("integration tests")
 crpc.Init(id)
 }
 
-func shutdownIntegrationTests() {
+func prepareBlobberShutdown() {
 crpc.Shutdown()
 }
-
-func startGRPCServer() {}

code/go/0chain.net/blobber/prepare_noop.go

@@ -0,0 +1,10 @@
+//go:build !integration_tests
+// +build !integration_tests
+
+package main
+
+// the following prepare functions are noop
+
+func prepareBlobber(id string) {}
+
+func prepareBlobberShutdown() {} //nolint:unused,deadcode // looks like it is being used in integration test