Pull blocks architecture - sync feature with 2.x branch (#71)

* this package must handle block, not query Signed-off-by: vadiminshakov <[email protected]> * this package must handle block, not query Signed-off-by: vadiminshakov <[email protected]> * change test Signed-off-by: vadiminshakov <[email protected]> * add vendor unpack Signed-off-by: vadiminshakov <[email protected]> * add compressed vendor Signed-off-by: vadiminshakov <[email protected]> * pull blocks Signed-off-by: vadiminshakov <[email protected]> * add channel context Signed-off-by: vadiminshakov <[email protected]> * refactor Explore usage and 'getblock' mode Signed-off-by: vadiminshakov <[email protected]> * fix make Signed-off-by: vadiminshakov <[email protected]> * fix ver Signed-off-by: vadiminshakov <[email protected]> * add UI screenshot Signed-off-by: vadiminshakov <[email protected]> * fix image link Signed-off-by: vadiminshakov <[email protected]> * fix deps Signed-off-by: vadiminshakov <[email protected]> * fix config Signed-off-by: vadiminshakov <[email protected]> * this package must handle block, not query Signed-off-by: vadiminshakov <[email protected]> * this package must handle block, not query Signed-off-by: vadiminshakov <[email protected]> * change test Signed-off-by: vadiminshakov <[email protected]> * add vendor unpack Signed-off-by: vadiminshakov <[email protected]> * add compressed vendor Signed-off-by: vadiminshakov <[email protected]> * pull blocks Signed-off-by: vadiminshakov <[email protected]> * add channel context Signed-off-by: vadiminshakov <[email protected]> * refactor Explore usage and 'getblock' mode Signed-off-by: vadiminshakov <[email protected]> * fix make Signed-off-by: vadiminshakov <[email protected]> * fix ver Signed-off-by: vadiminshakov <[email protected]> * add UI screenshot Signed-off-by: vadiminshakov <[email protected]> * fix image link Signed-off-by: vadiminshakov <[email protected]> * fix deps Signed-off-by: vadiminshakov <[email protected]> * fix config Signed-off-by: vadiminshakov <[email protected]>
hyperledger-labs · Oct 4, 2020 · c9bd755 · c9bd755
1 parent 10374a4
commit c9bd755
Show file tree

Hide file tree

Showing 18 changed files with 509 additions and 425 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,9 +26,9 @@ jobs:
 
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
-    
-    - name: download dependencies
-      run: go mod download 
+
+    - name: extract dependencies
+      run: tar -xf vendor.tar.xz
 
     - name: Build
       run: go build -v .

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -26,8 +26,8 @@ jobs:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v2
 
-    - name: download dependencies
-      run: go mod download 
+    - name: extract dependencies
+      run: tar -xf vendor.tar.xz
 
     - name: unit tests
-      run: cd blockfetcher && go test
+      run: cd blockhandler && go test
diff --git a/Makefile b/Makefile
@@ -1,13 +1,15 @@
 fabric-test:
+	@cd tests/chaincode/fabcar/go && tar -zxvf vendor.tar.gz
+	@cd /tmp/ && curl -sSL https://raw.githubusercontent.com/hyperledger/fabric/master/scripts/bootstrap.sh | bash -s 1.4.6
 	@cd tests/fabcar && ./startFabric.sh
 
 stop-fabric-test:
+	@sudo rm -rf /tmp/fabric-samples
 	@cd tests/fabcar && ./stopFabric.sh \
 	&& rm -rf credstore \
     && rm -rf cryptostore
 
 fabex-test:
-	@cd tests/chaincode/fabcar/go && GOPROXY="https://goproxy.io" GOSUMDB=off go mod vendor
 	@go run fabex.go -task=grpc -configpath=tests -configname=config -enrolluser=true -db=mongo
 
 fabex-mongo:
@@ -32,7 +34,7 @@ unit-tests:
 	@cd blockfetcher && go test -v
 
 integration-tests:
-	@cd tests/chaincode/fabcar/go && tar -zxvf vendor.tar.gz && GOPROXY="https://goproxy.io" GOSUMDB=off go mod vendor
+	@cd tests/chaincode/fabcar/go && tar -zxvf vendor.tar.gz
 	@sleep 10
 	@cd client/ && go test -v
 	@sleep 10

diff --git a/blockfetcher/blockfetcher.go b/blockfetcher/blockfetcher.go
diff --git a/blockfetcher/blockfetcher_test.go b/blockfetcher/blockfetcher_test.go