.gitignore

@@ -11,4 +11,6 @@
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
-.DS_Store
+.DS_Store
+
+.idea/

Dockerfile

@@ -0,0 +1,49 @@
+FROM golang:1.13-stretch
+
+MAINTAINER TRON-US <support@tron.network>
+# Dockerfile will build an image to run make build.
+
+#ENV PATH="/go/bin:${PATH}"
+
+ENV PROTOC_VERSION=3.10.0
+ENV GOLANG_PROTOBUF_VERSION=1.3.2
+ENV PROTOTOOL_VERSION=1.9.0
+
+# Install patch
+RUN apt-get update && apt-get install -y patch
+RUN apt-get install -y unzip 
+RUN apt-get install -y postgresql-client redis-tools
+
+# install standard c++ implementation of protocol buffers
+RUN wget --quiet https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip
+RUN unzip protoc-${PROTOC_VERSION}-linux-x86_64.zip -d protoc3
+RUN mv protoc3/bin/* /usr/local/bin/
+RUN mv protoc3/include/* /usr/local/include
+
+# install golang proto package
+RUN GO111MODULE=on go get \
+  github.com/golang/protobuf/protoc-gen-go@v${GOLANG_PROTOBUF_VERSION} && \
+  mv /go/bin/protoc-gen-go* /usr/local/bin/
+
+# install prototool
+RUN wget --quiet https://github.com/uber/prototool/releases/download/v${PROTOTOOL_VERSION}/prototool-Linux-x86_64.tar.gz
+RUN tar -xf prototool-Linux-x86_64.tar.gz
+RUN mv prototool/bin/prototool /usr/local/bin/prototool
+
+ENV SRC_DIR /go/src/github.com/tron-us/go-btfs-common
+
+# Download packages first so they can be cached.
+COPY go.mod go.sum $SRC_DIR/
+RUN cd $SRC_DIR \
+  && go mod download
+
+COPY . $SRC_DIR
+
+#WORKDIR /go-btfs-common
+WORKDIR $SRC_DIR
+
+# need to run trongogo before make build
+RUN make trongogo build
+
+# by default check protos dir for diffs
+CMD make test_git_diff_protos 

Makefile

@@ -1,34 +1,89 @@
+UNAME := $(shell uname)
 default: lintf
 
 TEST_DB_NAME ?= runtime
+TEST_DB_STATUS ?= db_status
+TEST_DB_GUARD ?= db_guard
 TEST_DB_USER ?= `whoami`
 TEST_DB_HOSTNAME ?= localhost
-TEST_DB_URL="postgresql://$(TEST_DB_USER)@$(TEST_DB_HOSTNAME):5432/$(TEST_DB_NAME)"
-TEST_RD_NAME ?= runtime
+TEST_DB_PORT ?= 5432
+TEST_DB_URL="postgresql://$(TEST_DB_USER)@$(TEST_DB_HOSTNAME):$(TEST_DB_PORT)/$(TEST_DB_NAME)"
+TEST_DB_URL_STATUS="postgresql://$(TEST_DB_USER)@$(TEST_DB_HOSTNAME):$(TEST_DB_PORT)/$(TEST_DB_STATUS)"
+TEST_DB_URL_GUARD="postgresql://$(TEST_DB_USER)@$(TEST_DB_HOSTNAME):$(TEST_DB_PORT)/$(TEST_DB_GUARD)"
+TEST_RD_NAME ?= 4
 TEST_RD_USER ?= `whoami`
 TEST_RD_HOSTNAME ?= localhost
-TEST_RD_URL="redis://$(TEST_RD_USER)@$(TEST_RD_HOSTNAME):6379/$(TEST_RD_NAME)"
+TEST_RD_PORT ?= 6379
+TEST_RD_URL="redis://$(TEST_RD_USER):@$(TEST_RD_HOSTNAME):$(TEST_RD_PORT)/$(TEST_RD_NAME)"
+DOCKER_TEST_RD_URL="redis://$(TEST_RD_HOSTNAME):$(TEST_RD_PORT)"
 
-install:
-	brew install protobuf
-	brew install prototool
-	brew install postgresql go
-	brew install redis go
-	brew services start postgresql
-	brew services start redis
+PG_FIX_CANDIDATES=./protos/node/node.pb.go \
+			./protos/status/status.pb.go \
+			./protos/escrow/escrow.pb.go \
+			./protos/guard/guard.pb.go \
+			./protos/online/online.pb.go \
+
+install: brew trongogo
+
+brew:
+	brew install go protobuf prototool postgresql redis
+
+trongogo:
+	cd ../ && git clone https://github.com/googleapis/googleapis.git && cd go-btfs-common || true
+	cd ../ && git clone https://github.com/TRON-US/protobuf || true
+	cd ../protobuf && git checkout master && git pull && make
+	cd ../googleapis && git checkout master && git pull
 
 lintf:
 	prototool lint ./protos
 	prototool format -w
+	go fmt ./...
+	go mod tidy
 
-build:
+genproto:
 	prototool all
-	go mod tidy
+
+buildgo:
 	go build ./...
 
+pgfix:
+ifeq ($(UNAME), Linux)
+	for pb in  $(PG_FIX_CANDIDATES); \
+	do \
+	sed -in 's/TableName/tableName/g' $$pb; \
+	sed -in 's/protobuf:"bytes,[0-9]*,opt,name=table_name,json=tableName,proto[0-9]*" json:"table_name,omitempty" pg:"table_name" //g' $$pb; \
+	done
+endif
+ifeq ($(UNAME), Darwin)
+	for pb in  $(PG_FIX_CANDIDATES); \
+	do \
+	sed -i '' -e 's/TableName/tableName/g' $$pb; \
+	sed -i '' -e 's/protobuf:"bytes,[0-9]*,opt,name=table_name,json=tableName,proto[0-9]*" json:"table_name,omitempty" pg:"table_name" //g' $$pb; \
+	done
+endif
+
+build: lintf genproto buildgo pgfix
+
 test:
+	brew services start postgresql
+	brew services start redis
 	dropdb --if-exists $(TEST_DB_NAME)
+	dropdb --if-exists $(TEST_DB_GUARD)
+	dropdb --if-exists $(TEST_DB_STATUS)
 	createdb $(TEST_DB_NAME)
-	go test -v ./... -args -db_url=$(TEST_DB_URL) -rd_url=$(TEST_RD_URL)
+	createdb $(TEST_DB_GUARD)
+	createdb $(TEST_DB_STATUS)
+	TEST_DB_URL=$(TEST_DB_URL) TEST_DB_URL_STATUS=$(TEST_DB_URL_STATUS) TEST_DB_URL_GUARD=$(TEST_DB_URL_GUARD) TEST_RD_URL=$(TEST_RD_URL) go test -v ./...
 	dropdb $(TEST_DB_NAME)
+	dropdb $(TEST_DB_STATUS)
+	dropdb $(TEST_DB_GUARD)
+	brew services stop postgresql
+	brew services stop redis
+
+test_docker:
+	sleep 10
+	TEST_DB_URL=$(TEST_DB_URL) TEST_DB_URL_STATUS=$(TEST_DB_URL_STATUS) TEST_DB_URL_GUARD=$(TEST_DB_URL_GUARD) TEST_RD_URL=$(TEST_RD_URL) go test -v ./...
 
+test_git_diff_protos:
+	bin/test-git-diff-protos
+.PHONY: test_git_dif_protos

README.md

@@ -13,6 +13,10 @@ Common packages among various go-btfs projects.
 ├── LICENSE
 ├── Makefile
 ├── README.md
+├── config
+│   └── common.go
+├── crypto
+│   └── crypto.go
 ├── go.mod
 ├── go.sum
 ├── info
@@ -38,11 +42,30 @@ Common packages among various go-btfs projects.
 │   └── status
 │       ├── status.pb.go
 │       └── status.proto
-└── prototool.yaml
+├── prototool.yaml
+├── tree.txt
+└── utils
+    ├── grpc_health_check_provider.go
+    ├── runtime.go
+    └── runtime_test.go
 ```
 
 ## Install Tools
 
+#### install TRON version(pg support) protobuf
+
+```
+cd github.com/tron-us
+```
+```
+git clone https://github.com/TRON-US/protobuf
+```
+```
+cd protobuf && make
+```
+
+#### other tools
+
 ```
 make install
 ```
@@ -62,3 +85,18 @@ make lintf
 ```
 make build
 ```
+
+## Use docker container to run 'git diff protos/'
+
+```
+$ docker build -f Dockerfile -t "go-btfs-common" .
+$ docker run -i go-btfs-common
+```
+
+## Run interactive bash inside docker container for diagnosis
+
+```
+$ docker build -f Dockerfile -t "go-btfs-common" .
+$ docker run -it go-btfs-common /bin/bash
+```
+

bin/test-git-diff-protos

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -euo pipefail
+git --no-pager diff protos/ >> diffs.txt
+if [ -n "$(cat diffs.txt)" ]; then
+	echo "The following protos have changed."
+	echo "-----------------------------------"
+	cat diffs.txt
+	echo "-----------------------------------"
+	echo "Please regenerate code so protos are consistent with Master."
+	rm -f diffs.txt
+	exit 1
+fi
+rm -f diffs.txt
+

config/common.go

@@ -12,6 +12,9 @@ import (
 
 var (
 	ConstMinQuestionsCountPerChallenge = 100
+	ConstMinQuestionsCountPerShard     = 100
+
+	ConstRequestPayoutBatchPageSize = 100
 )
 
 func init() {
@@ -25,10 +28,16 @@ func init() {
 }
 
 func GetMinimumQuestionsCountPerShard(status *guard.FileStoreStatus) (val int) {
-	if status == nil || status.FileStoreMeta.CheckFrequency == 0 {
-		//if it is 0 or status is nil, means using default frequency, 12 per year
-		return ConstMinQuestionsCountPerChallenge * 12
-	}
+	//Below comment codes were reserved here
+	//if status == nil || status.FileStoreMeta.CheckFrequency == 0 {
+	//	//if it is 0 or status is nil, means using default frequency
+	//	return ConstMinQuestionsCountPerChallenge * 52
+	//}
+	//
+	//return int(status.FileStoreMeta.CheckFrequency) * ConstMinQuestionsCountPerChallenge
+	return ConstMinQuestionsCountPerShard
+}
 
-	return int(status.FileStoreMeta.CheckFrequency) * ConstMinQuestionsCountPerChallenge
+func GetRenewContingencyPercentage() (percent int) {
+	return 10
 }

config/common_test_vars.go

@@ -0,0 +1,27 @@
+package config
+
+import (
+	"errors"
+	"fmt"
+	"os"
+)
+
+var (
+	DbStatusURL         string
+	DbGuardURL          string
+	RdURL               string
+	FoundPgStatusString bool
+	FoundPgGuardString  bool
+	FoundDbRdString     bool
+)
+
+func InitTestDB() error {
+	//get db and redis connection strings
+	DbStatusURL, FoundPgStatusString = os.LookupEnv("TEST_DB_URL_STATUS")
+	DbGuardURL, FoundPgGuardString = os.LookupEnv("TEST_DB_URL_STATUS")
+	RdURL, FoundDbRdString = os.LookupEnv("TEST_RD_URL")
+	if FoundPgStatusString == false || FoundPgGuardString == false || FoundDbRdString == false {
+		return errors.New(fmt.Sprintf("TEST_DB_URL_STATUS or TEST_DB_URL_STATUS or TEST_RD_URL env vars need to be set before running test"))
+	}
+	return nil
+}

controller/defaultController.go

@@ -0,0 +1,5 @@
+package controller
+
+type DefaultController struct {
+	ServerName string
+}