Re org directory to match Go best practice

Move main.go to cmd.stupid Move infra under pkg Update readme accordingly Update gitignore to allow cmd/stupid dir Remove sample chaincodes Signed-off-by: Jay Guo <guojiannan1101@gmail.com>
Hyperledger-TWGC · Nov 6, 2020 · b4d66f6 · b4d66f6
1 parent 18c1e00
commit b4d66f6
Show file tree

Hide file tree

Showing 17 changed files with 10 additions and 59 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@
 *.dll
 *.so
 *.dylib
-stupid
+./stupid
 
 # Test binary, build with `go test -c`
 *.test

diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ Go1.11 or higher. Go1.13 is recommended.
 
 You need to build from source for now (Docker image on the way).
 
-Clone this repo and run `go build` at root dir. This is a go module project so you don't need to clone it into `GOPATH`. It will download required dependencies automatically, which may take a while depending on network connection. Once it finishes building, you should have a executable named `stupid`.
+Clone this repo and run `go build ./cmd/stupid` at root dir. This is a go module project so you don't need to clone it into `GOPATH`. It will download required dependencies automatically, which may take a while depending on network connection. Once it finishes building, you should have a executable named `stupid`.
 
 ### Configure
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -19,11 +19,12 @@ jobs:
       - task: Go@0
         inputs:
           command: 'get'
-          arguments: '-d'
+          arguments: '-d ./...'
           workingDirectory: '$(System.DefaultWorkingDirectory)'
       - task: Go@0
         inputs:
           command: 'build'
+          arguments: './...'
           workingDirectory: '$(System.DefaultWorkingDirectory)'
 
   - job: 
@@ -35,7 +36,7 @@ jobs:
       - task: Go@0
         inputs:
           command: 'get'
-          arguments: '-d'
+          arguments: '-d ./...'
           workingDirectory: '$(System.DefaultWorkingDirectory)'
       - task: Go@0
         inputs:

diff --git a/chaincodes/go.mod b/chaincodes/go.mod
diff --git a/chaincodes/putget.go b/chaincodes/putget.go
diff --git a/main.go → cmd/stupid/main.go b/main.go → cmd/stupid/main.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/guoger/stupid/infra"
+	"github.com/guoger/stupid/pkg/infra"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/integration-test.sh b/integration-test.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -ex
 
 DIR=$PWD
 
@@ -8,7 +8,7 @@ cd ./fabric-samples/test-network
 echo y |  ./network.sh up createChannel
 echo y |  ./network.sh deployCC
 cp -r organizations "$DIR" && cd "$DIR"
-go build
+go build ./cmd/stupid
 STUPID_LOGLEVEL=debug ./stupid config.yaml 100
 
 
diff --git a/infra/assembler.go → pkg/infra/assembler.go b/infra/assembler.go → pkg/infra/assembler.go
diff --git a/infra/client.go → pkg/infra/client.go b/infra/client.go → pkg/infra/client.go
diff --git a/infra/config.go → pkg/infra/config.go b/infra/config.go → pkg/infra/config.go
diff --git a/infra/config_test.go → pkg/infra/config_test.go b/infra/config_test.go → pkg/infra/config_test.go
@@ -4,10 +4,9 @@ import (
 	"io/ioutil"
 	"os"
 
+	"github.com/guoger/stupid/pkg/infra"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"github.com/guoger/stupid/infra"
 )
 
 var _ = Describe("Config", func() {

diff --git a/infra/crypto.go → pkg/infra/crypto.go b/infra/crypto.go → pkg/infra/crypto.go
diff --git a/infra/infra_suite_test.go → pkg/infra/infra_suite_test.go b/infra/infra_suite_test.go → pkg/infra/infra_suite_test.go
diff --git a/infra/observer.go → pkg/infra/observer.go b/infra/observer.go → pkg/infra/observer.go
diff --git a/infra/proposal.go → pkg/infra/proposal.go b/infra/proposal.go → pkg/infra/proposal.go
diff --git a/infra/proposer.go → pkg/infra/proposer.go b/infra/proposer.go → pkg/infra/proposer.go
diff --git a/infra/proposer_test.go → pkg/infra/proposer_test.go b/infra/proposer_test.go → pkg/infra/proposer_test.go
@@ -1,7 +1,7 @@
 package infra_test
 
 import (
-	"github.com/guoger/stupid/infra"
+	"github.com/guoger/stupid/pkg/infra"
 	"github.com/hyperledger/fabric-sdk-go/pkg/fab/mocks"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"