diff --git a/Uber-Lyra/artifacts/docker-compose.yaml b/Uber-Lyra/artifacts/docker-compose.yaml index 5c200a5..2e544bf 100644 --- a/Uber-Lyra/artifacts/docker-compose.yaml +++ b/Uber-Lyra/artifacts/docker-compose.yaml @@ -38,6 +38,10 @@ services: container_name: orderer.example.com image: hyperledger/fabric-orderer environment: + - ORDERER_GENERAL_LEDGERTYPE=ram + - ORDERER_GENERAL_BATCHTIMEOUT=10000s + - ORDERER_GENERAL_BATCHSIZE_MAXMESSAGECOUNT=10000 + - ORDERER_GENERAL_MAXWINDOWSIZE=10000 - ORDERER_GENERAL_LOGLEVEL=debug - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - ORDERER_GENERAL_GENESISMETHOD=file @@ -67,8 +71,7 @@ services: - CORE_PEER_ID=peer0.org1.example.com - CORE_PEER_LOCALMSPID=Org1MSP - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 - - CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft - - CORE_PBFT_GENERAL_MODE=batch + - CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=noops ports: - 7051:7051 - 7053:7053 @@ -86,8 +89,7 @@ services: - CORE_PEER_ID=peer1.org1.example.com - CORE_PEER_LOCALMSPID=Org1MSP - CORE_PEER_ADDRESS=peer1.org1.example.com:7051 - - CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft - - CORE_PBFT_GENERAL_MODE=batch + - CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=noops ports: - 7056:7051 - 7058:7053 @@ -102,6 +104,7 @@ services: file: base.yaml service: peer-base environment: + - CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=noops - CORE_PEER_ID=peer0.org2.example.com - CORE_PEER_LOCALMSPID=Org2MSP - CORE_PEER_ADDRESS=peer0.org2.example.com:7051 @@ -119,11 +122,10 @@ services: file: base.yaml service: peer-base environment: + - CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=noops - CORE_PEER_ID=peer1.org2.example.com - CORE_PEER_LOCALMSPID=Org2MSP - CORE_PEER_ADDRESS=peer1.org2.example.com:7051 - - CORE_PEER_VALIDATOR_CONSENSUS_PLUGIN=pbft - - CORE_PBFT_GENERAL_MODE=batch ports: - 8056:7051 - 8058:7053 diff --git a/Uber-Lyra/blockchainManager.js b/Uber-Lyra/blockchainManager.js index 2adfb55..2aa2273 100644 --- a/Uber-Lyra/blockchainManager.js +++ b/Uber-Lyra/blockchainManager.js @@ -110,9 +110,7 @@ class BlockchainManager { } start = now(); - var chain; - return Promise.resolve([]) - .then(all => cannonBalls[0].then(Array.prototype.concat.bind(all))) + return Promise.all(cannonBalls); }) .then(() => { end = now(); @@ -236,9 +234,7 @@ class BlockchainManager { } //Launch the accounts start = now(); - - return Promise.resolve([]) - .then(all => all_promise[0].then(Array.prototype.concat.bind(all))) + return Promise.all(all_promise) .then(() => { end = now(); this.profilingTime(start, end, amount, 'acc');