Skip to content

Commit

Permalink
[FAB-5897]Upgrade client to use fabric.v1.0.1
Browse files Browse the repository at this point in the history
Change-Id: I0b0124d4f24446002cd85fdddab5558dbc348637
Signed-off-by: biljana lukovic <biljana.lukovic@securekey.com>
  • Loading branch information
biljanaLukovic committed Aug 24, 2017
1 parent 110bf21 commit 08be791
Show file tree
Hide file tree
Showing 146 changed files with 12,532 additions and 7,650 deletions.
10 changes: 5 additions & 5 deletions test/fixtures/.env
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
# Default architecture
ARCH=x86_64

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_TAG=1.0.1
FABRIC_ORDERER_FIXTURE_TAG=1.0.1
FABRIC_PEER_FIXTURE_TAG=1.0.1
FABRIC_COUCHDB_FIXTURE_TAG=1.0.1
FABRIC_BUILDER_FIXTURE_TAG=1.0.1

FABRIC_CA_FIXTURE_IMAGE=hyperledger/fabric-ca
FABRIC_ORDERER_FIXTURE_IMAGE=hyperledger/fabric-orderer
Expand Down
Binary file modified test/fixtures/channel/mychannel.tx
Binary file not shown.
Binary file modified test/fixtures/channel/orgchannel.tx
Binary file not shown.
Binary file added test/fixtures/channel/testchannel.tx
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
MIICFjCCAb2gAwIBAgIUXoXObezolw0/mLd00t0vISDzITMwCgYIKoZIzj0EAwIw
MIICFjCCAb2gAwIBAgIUEsAD7LR8KQ8Y3kUPbF8/tFlEZ+8wCgYIKoZIzj0EAwIw
aDELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQK
EwtIeXBlcmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMt
Y2Etc2VydmVyMB4XDTE3MDgxMTEzMjYwMFoXDTMyMDgwNzEzMjYwMFowaDELMAkG
Y2Etc2VydmVyMB4XDTE3MDgyMzE5NTkwMFoXDTMyMDgxOTE5NTkwMFowaDELMAkG
A1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQKEwtIeXBl
cmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMtY2Etc2Vy
dmVyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE4bPLBy8ZFeyUyHesJYa8lpCn
A8suEpeaLfneOclsBgcF16A08630rRbmrqxj7YVzmXB3QNYAQ2LIx2NwjMzKLqNF
dmVyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEkzg+aHdnO15K7KD0PFOi/22d
EhpGMyGdQuw+faPSYCQvShtwxoiwADZi1i+RQjL2hVdifEbtBUpMT6vzs5UhH6NF
MEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYE
FFy6dJowU3og1hUOZty8M1Y+oCZ9MAoGCCqGSM49BAMCA0cAMEQCIHo0XmHkYbyK
U31NQi5COqqe/no+Sw2tiYzf5BWfqbyUAiAbo7lpkpGsJcoQ7PlIrQJA+jg6h6+k
EzTx/rehEo8pBg==
FNZ0cWs0/Hh4KB0RKAee++EdcuPvMAoGCCqGSM49BAMCA0cAMEQCIG9oAvJocsXY
PRtxPczgfb7ns+leADF2M/hgxqzrwhbUAiAthfoYUNBcdQiGikODpCAif7u6NhPr
xIennFoJQIc9fw==
-----END CERTIFICATE-----
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
-----BEGIN CERTIFICATE-----
MIICFjCCAb2gAwIBAgIUIMjrKaHzcPAcvhQudXGndzmlByYwCgYIKoZIzj0EAwIw
MIICFzCCAb2gAwIBAgIUEC6J0xPaJBbBEN+A7MRGPXVU1+gwCgYIKoZIzj0EAwIw
aDELMAkGA1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQK
EwtIeXBlcmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMt
Y2Etc2VydmVyMB4XDTE3MDgxMTEzMjYwMFoXDTMyMDgwNzEzMjYwMFowaDELMAkG
Y2Etc2VydmVyMB4XDTE3MDgyMzE5NTkwMFoXDTMyMDgxOTE5NTkwMFowaDELMAkG
A1UEBhMCVVMxFzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRQwEgYDVQQKEwtIeXBl
cmxlZGdlcjEPMA0GA1UECxMGRmFicmljMRkwFwYDVQQDExBmYWJyaWMtY2Etc2Vy
dmVyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEkzfk9zYTG+W/T605IQWbyjkN
6yfG/e4qyc3Ryr5bIwEwj9NdGc8K7czFU/Kq5PCcJ39sYctsGpU8XqJbmF1SO6NF
dmVyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEc5vX6UvyXuIroNmZxn/PkfMt
vZYOWcDt0ZKgj5RWhXb0Cfx/qzm3fn3u2q3Z6HIoFm5Op48QWVX6RKqkuHza4aNF
MEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYE
FMH123cQupbZ9Uv51P9KQXMXZ3MEMAoGCCqGSM49BAMCA0cAMEQCIEa1K99N3i0r
g8Y78m52S4UWvoHpVKoTfhJ5/FZi6nlIAiAQHNC9sTVrBFKhiWak0GHXFfCopDgY
SHj4lA47QzFirg==
FDURrc9lWNXg4XUMcXfEZMgsjhMOMAoGCCqGSM49BAMCA0gAMEUCIQDkAq2qLQCB
EMNKECvzFLvpw+IzI8rAjSoLXS7mV+VIgQIgHj3M7LxkfnDg/85d5cp/f7D/RPSX
zdDmrOtKqqzLcmo=
-----END CERTIFICATE-----
13 changes: 10 additions & 3 deletions test/scripts/integration-container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,17 @@
#
# SPDX-License-Identifier: Apache-2.0
#

set -e
# Packages to include in test run
PKGS=`go list github.com/hyperledger/fabric-sdk-go/test/integration/... 2> /dev/null | \
grep -v /vendor/`

echo "***Running integration tests..."
go test -race -cover $GOTESTFLAGS $LDFLAGS $PKGS -p 1 -timeout=40m
echo "***Running integration tests...on "
RACEFLAG=""
ARCH=$(uname -m)

if [ "$ARCH" == "x86_64" ]
then
RACEFLAG="-race"
fi
go test $RACEFLAG -cover $GOTESTFLAGS $LDFLAGS $PKGS -p 1 -timeout=40m
11 changes: 9 additions & 2 deletions test/scripts/unit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ PKGS=`go list $REPO... 2> /dev/null | \
grep -v ^$REPO/api/ | \
grep -v ^$REPO/pkg/fabric-ca-client/mocks | grep -v ^$REPO/pkg/fabric-client/mocks | \
grep -v ^$REPO/vendor/ | grep -v ^$REPO/test/`
echo "Running tests..."
echo "Running unit tests..."

go test -race -cover $GOTESTFLAGS $LDFLAGS $PKGS -p 1 -timeout=40m
RACEFLAG=""
ARCH=$(uname -m)

if [ "$ARCH" == "x86_64" ]
then
RACEFLAG="-race"
fi
go test $RACEFLAG -cover $GOTESTFLAGS $LDFLAGS $PKGS -p 1 -timeout=40m
8 changes: 2 additions & 6 deletions vendor/github.com/cloudflare/cfssl/api/api.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions vendor/github.com/cloudflare/cfssl/csr/csr.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 08be791

Please sign in to comment.