Skip to content

Commit

Permalink
Merge pull request #515 from vita-dounai/fisco-bcos
Browse files Browse the repository at this point in the history
Implement FISCO BCOS adapter
  • Loading branch information
nklincoln authored Oct 24, 2019
2 parents 7812efa + 714d4ad commit 8f629b5
Show file tree
Hide file tree
Showing 77 changed files with 3,908 additions and 3 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,12 @@ _site/

# pm2 files
**/.pm2/

# lerna log
lerna-debug.log

# contract address file
**/*.address

# Ignore data
data/
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Each `caliper-<adapter>` is a separate package that contains a distinct adaptor
- caliper-fabric
- caliper-iroha
- caliper-sawtooth
- caliper-fisco-bcos

Each adaptor implements the `BlockchainInterface` from the core package, as well as a `ClientFactory` and `ClientWorker` that are bespoke to the adaptor.

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Currently supported blockchain solutions:
* [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)
* [FISCO BCOS v2.0.0](https://github.com/FISCO-BCOS/FISCO-BCOS)

[Hyperledger Composer](https://github.com/hyperledger/composer) is also supported.

Expand Down
2 changes: 1 addition & 1 deletion packages/caliper-cli/caliper.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ results.thePromise.then( () => {
}
process.exit(0);
}).catch((error) => {
cmdUtil.log(error+chalk.red('\nCommand failed\n'));
cmdUtil.log(error.stack+chalk.red('\nCommand failed\n'));
process.exit(1);
});
1 change: 1 addition & 0 deletions packages/caliper-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"@hyperledger/caliper-iroha": "^0.1.0",
"@hyperledger/caliper-sawtooth": "^0.1.0",
"@hyperledger/caliper-ethereum": "^0.1.0",
"@hyperledger/caliper-fisco-bcos": "^0.1.0",
"chalk": "1.1.3",
"yargs": "10.0.3"
},
Expand Down
26 changes: 26 additions & 0 deletions packages/caliper-fisco-bcos/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
16 changes: 16 additions & 0 deletions packages/caliper-fisco-bcos/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

coverage
node_modules
48 changes: 48 additions & 0 deletions packages/caliper-fisco-bcos/.eslintrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
env:
es6: true
node: true
mocha: true
extends: 'eslint:recommended'
parserOptions:
ecmaVersion: 8
sourceType:
- script
rules:
indent:
- error
- 4
linebreak-style:
- error
- unix
quotes:
- error
- single
semi:
- error
- always
no-unused-vars:
- error
- args: none
no-console: error
curly: error
eqeqeq: error
no-throw-literal: error
strict: error
no-var: error
dot-notation: error
no-tabs: error
no-trailing-spaces: error
no-use-before-define: error
no-useless-call: error
no-with: error
operator-linebreak: error
require-jsdoc:
- error
- require:
ClassDeclaration: true
MethodDefinition: true
FunctionDeclaration: true
valid-jsdoc:
- error
- requireReturn: false
yoda: error
18 changes: 18 additions & 0 deletions packages/caliper-fisco-bcos/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

'use strict';

module.exports.AdminClient = require('./lib/fiscoBcos');
module.exports.ClientFactory = require('./lib/fiscoBcosClientFactory');
Loading

0 comments on commit 8f629b5

Please sign in to comment.