Skip to content

Commit

Permalink
Merge pull request hyperledger-caliper#99 from ynamiki/merge-fabric-v11
Browse files Browse the repository at this point in the history
Merge network/fabric-v11 and network/fabric directories
  • Loading branch information
HaojunZhou authored Jul 3, 2018
2 parents d437bc1 + 97172ab commit 38b5caa
Show file tree
Hide file tree
Showing 200 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions benchmark/composer/config-composer.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"blockchain": {
"type": "composer",
"config": "network/fabric-v11/2-org-1-peer/composer.json"
"config": "network/fabric/2-org-1-peer/composer.json"
},
"command" : {
"start": "docker-compose -f network/fabric-v11/2-org-1-peer/docker-compose.yaml up -d",
"end": "docker-compose -f network/fabric-v11/2-org-1-peer/docker-compose.yaml down;docker rm $(docker ps -aq);docker rmi $(docker images dev-* -q)"
"start": "docker-compose -f network/fabric/2-org-1-peer/docker-compose.yaml up -d",
"end": "docker-compose -f network/fabric/2-org-1-peer/docker-compose.yaml down;docker rm $(docker ps -aq);docker rmi $(docker images dev-* -q)"
},
"test": {
"name": "Composer Performance test",
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"cryptodir": "network/fabric-v11/config/crypto-config",
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"cryptodir": "network/fabric-v11/config/crypto-config",
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"cryptodir": "network/fabric-v11/config/crypto-config",
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"cryptodir": "network/fabric-v11/config/crypto-config",
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"cryptodir": "network/fabric-v11/config/crypto-config",
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2"], "loglevel": "INFO"}],
"cryptodir": "network/fabric-v11/config/crypto-config",
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2", "Org3"], "loglevel": "INFO"}],
"cryptodir": "network/fabric-v11/config/crypto-config",
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 10000,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2", "Org3"], "loglevel": "INFO"}],
"cryptodir": "network/fabric-v11/config/crypto-config",
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 10000,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2", "Org3"], "loglevel": "INFO"}],
"cryptodir": "network/fabric-v11/config/crypto-config",
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2", "Org3"], "loglevel": "INFO"}],
"cryptodir": "network/fabric-v11/config/crypto-config",
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2", "Org3"], "loglevel": "INFO"}],
"cryptodir": "network/fabric-v11/config/crypto-config",
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"composer": {
"chaincodes": [{"id": "basic-sample-network", "version": "0.1.0", "path": "contract/composer", "orgs": ["Org1", "Org2", "Org3"], "loglevel": "INFO"}],
"cryptodir": "network/fabric-v11/config/crypto-config",
"cryptodir": "network/fabric/config/crypto-config",
"network": {
"x-type" : "hlfv1",
"timeout": 3000,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 38b5caa

Please sign in to comment.