Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed old fabric adapter and related examples #520

Merged
merged 1 commit into from
Jul 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Welcome to the Hyperledger Caliper project. Caliper is a blockchain performance benchmark framework, which allows users to test different blockchain solutions with predefined use cases, and get a set of performance test results.

Currently supported blockchain solutions:
* [fabric v1.0+](https://github.com/hyperledger/fabric), the lastest version that has been verified is v1.1.0
* [fabric v1.0+](https://github.com/hyperledger/fabric), the latest version that has been verified is v1.4.1
* [sawtooth 1.0+](https://github.com/hyperledger/sawtooth-core)
* [Iroha 1.0 beta-3](https://github.com/hyperledger/iroha)
* [Burrow 1.0](https://github.com/hyperledger/burrow)
Expand All @@ -16,7 +16,7 @@ Currently supported performance indicators:
* Transaction/Read latency(minimum, maximum, average, percentile)
* Resource consumption (CPU, Memory, Network IO,...)

See contact [performance and scale workgroup](https://chat.hyperledger.org/channel/performance-and-scale-wg) to find out the definitions and corresponding measurement methods.
See the [PSWG white paper](https://www.hyperledger.org/resources/publications/blockchain-performance-metrics) to find out the definitions and corresponding measurement methods.

For more information on using Caliper please consult the [documentation site](https://hyperledger.github.io/caliper/)

Expand All @@ -29,7 +29,7 @@ Make sure following tools are installed:
* Docker-compose

## Building Caliper
Caliper is split into pacakges that are managed by Lerna, a tool for managing JavaScript projects with multiple packages. To build Caliper, it is necessary to first pull the required base dependancies, and then bootstrap the Caliper project. Note that if you modify base code, it is necessary to rebuild the project
Caliper is split into packages that are managed by Lerna, a tool for managing JavaScript projects with multiple packages. To build Caliper, it is necessary to first pull the required base dependancies, and then bootstrap the Caliper project. Note that if you modify base code, it is necessary to rebuild the project

* Run `npm install` in Caliper root folder to install base dependencies locally
* Run `npm run repoclean` in Caliper root folder to ensure that all the packages are clean
Expand All @@ -44,7 +44,7 @@ If you have any issues using Caliper that the documentation does not help you so
* [Issues](https://github.com/hyperledger/caliper/issues) Feel free to raise an issue if you are facing a Caliper related problem

Caliper interacts with multiple blockchain technologies and consequently it *might* be an issue with the underlying blockchain technology being interacted with. You can seek specific help on these technologies within the following Rocket Chat channels:
* [Hypereledger Burrow](https://chat.hyperledger.org/channel/burrow)
* [Hyperledger Burrow](https://chat.hyperledger.org/channel/burrow)
* [Hyperledger Composer](https://chat.hyperledger.org/channel/composer)
* [Hyperledger Fabric](https://chat.hyperledger.org/channel/fabric)
* [Hyperledger Iroha](https://chat.hyperledger.org/channel/iroha)
Expand Down
1 change: 0 additions & 1 deletion packages/caliper-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"caliper-core" : "0.1.0",
"caliper-burrow" : "0.1.0",
"caliper-composer" : "0.1.0",
"caliper-fabric" : "0.1.0",
"caliper-fabric-ccp" : "0.1.0",
"caliper-iroha" : "0.1.0",
"caliper-sawtooth" : "0.1.0",
Expand Down
26 changes: 0 additions & 26 deletions packages/caliper-core/lib/test/defaultTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,32 +77,6 @@ class DefaultTest {
// condition for time based or number based test driving
if (args.txNumber) {
msg.numb = testRounds[i];
// File information for reading or writing transaction request
msg.txFile = {roundLength: testRounds.length, roundCurrent: i, txMode: args.txMode};
if (args.txMode && args.txMode.type === 'file-write') {
logger.info('------ Prepare(file-write) waiting ------');
msg.txFile.readWrite = 'write';
msg.rateControl = {type: 'fixed-rate', opts: {tps: 400}};
try {
await this.clientOrchestrator.startTest(msg, this.clientArgs, function(){}, testLabel, this.clientFactory);
msg.numb = testRounds[i];
msg.txFile.readWrite = 'read';
msg.rateControl = args.rateControl[i] ? args.rateControl[i] : {type:'fixed-rate', 'opts' : {'tps': 1}};
if(i === (testRounds.length - 1)) {
logger.info('Waiting 5 seconds...');
logger.info('------ Prepare(file-write) success------');
await CaliperUtils.sleep(5000);
}
} catch (err) {
logger.error('------Prepare(file-write) failed------');
args.txMode.type = 'file-no';
}

} else if(args.txMode && args.txMode.type === 'file-read'){
msg.txFile.readWrite = 'read';
} else {
msg.txFile.readWrite = 'no';
}
} else if (args.txDuration) {
msg.txDuration = testRounds[i];
} else {
Expand Down
26 changes: 0 additions & 26 deletions packages/caliper-fabric/.editorconfig

This file was deleted.

17 changes: 0 additions & 17 deletions packages/caliper-fabric/.eslintignore

This file was deleted.

48 changes: 0 additions & 48 deletions packages/caliper-fabric/.eslintrc.yml

This file was deleted.

19 changes: 0 additions & 19 deletions packages/caliper-fabric/index.js

This file was deleted.

Loading