[FAB-4633] Support Fabric 1.0.0

Change-Id: I20b9372872b60e2ba389b0e1559aba51e067d3cb
Signed-off-by: Troy Ronda <troy@troyronda.com>
Signed-off-by: Divyank Katira <Divyank.Katira@securekey.com>

Makefile

@@ -9,11 +9,20 @@
 # depend: installs test dependencies
 # unit-test: runs all the unit tests
 # integration-test: runs all the integration tests
-# race-test: runs tests with race detector 
+# race-test: runs tests with race detector
 # checks: runs all check conditions (license, spelling, linting)
 # clean: stops docker conatainers used for integration testing
 # mock-gen: generate mocks needed for testing (using mockgen)
 #
+#
+# Instructions to generate .tx files used for creating channels:
+# Download the configtxgen binary for your OS from (it is located in the .tar.gz file):
+# https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric
+# Sample command: $ path/to/configtxgen -profile TwoOrgsChannel -outputCreateChannelTx testchannel.tx -channelID testchannel
+# More Docs: http://hyperledger-fabric.readthedocs.io/en/latest/configtxgen.html
+#
+
+
 
 export ARCH=$(shell uname -m)
 export LDFLAGS=-ldflags=-s

README.md

@@ -38,8 +38,8 @@ repository.
 ### Compatibility
 
 This client SDK was last tested and found to be compatible with the following Hyperledger Fabric commit levels:
-- fabric: v1.0.0-beta, v1.0.0-rc1
-- fabric-ca: v1.0.0-beta, v1.0.0-rc1
+- fabric: v1.0.0
+- fabric-ca: v1.0.0
 
 ### Running the test suite
 
@@ -135,14 +135,14 @@ Alternatively you can build and run Fabric on your own box using the following c
 cd $GOPATH/src/github.com/hyperledger/
 git clone https://github.com/hyperledger/fabric
 cd $GOPATH/src/github.com/hyperledger/fabric/
-git checkout v1.0.0-rc1
+git checkout v1.0.0
 make docker
 
 # Build fabric-ca:
 cd $GOPATH/src/github.com/hyperledger/
 git clone https://github.com/hyperledger/fabric-ca
 cd $GOPATH/src/github.com/hyperledger/fabric-ca/
-git checkout v1.0.0-rc1
+git checkout v1.0.0
 make docker
 
 # Start fabric - latest-env.sh overrides the default docker tags in .env

test/fixtures/.env

@@ -11,11 +11,11 @@
 # Default architecture
 ARCH=x86_64
 
-FABRIC_CA_FIXTURE_TAG=1.0.0-rc1
-FABRIC_ORDERER_FIXTURE_TAG=1.0.0-rc1
-FABRIC_PEER_FIXTURE_TAG=1.0.0-rc1
-FABRIC_COUCHDB_FIXTURE_TAG=1.0.0-rc1
-FABRIC_BUILDER_FIXTURE_TAG=1.0.0-rc1
+FABRIC_CA_FIXTURE_TAG=1.0.0
+FABRIC_ORDERER_FIXTURE_TAG=1.0.0
+FABRIC_PEER_FIXTURE_TAG=1.0.0
+FABRIC_COUCHDB_FIXTURE_TAG=1.0.0
+FABRIC_BUILDER_FIXTURE_TAG=1.0.0
 
 FABRIC_CA_FIXTURE_IMAGE=hyperledger/fabric-ca
 FABRIC_ORDERER_FIXTURE_IMAGE=hyperledger/fabric-orderer

test/integration/orgs/test_setup.go

@@ -91,7 +91,7 @@ func createTestChannel(t *testing.T) {
 	}
 
 	err = admin.CreateOrUpdateChannel(orgTestClient, ordererAdminUser, org1AdminUser,
-		orgTestChannel, "../../fixtures/channel/mychannel.tx")
+		orgTestChannel, "../../fixtures/channel/orgchannel.tx")
 	failTestIfError(err, t)
 	// Allow orderer to process channel creation
 	time.Sleep(time.Millisecond * 500)

test/scripts/fabric_test_commitlevel.sh

@@ -11,5 +11,5 @@ export USE_PREBUILT_IMAGES=true
 
 #file used for automatic integration build test
 #This should always match the compatibility specified in the README.md
-export FABRIC_COMMIT=v1.0.0-rc1
-export FABRIC_CA_COMMIT=v1.0.0-rc1
+export FABRIC_COMMIT=v1.0.0
+export FABRIC_CA_COMMIT=v1.0.0