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

Caliper Ethereum documentation overhaul #1591

Conversation

rmarede
Copy link
Contributor

@rmarede rmarede commented Jun 4, 2024

Checklist

  • A link to the issue/user story that the pull request relates to
  • How to recreate the problem without the fix
  • Design of the fix
  • How to prove that the fix works
  • Automated tests that prove the fix keeps on working
  • Documentation

Issue/User story

Caliper Ethereum documentation was outdated and did not provide information on using the --caliper-flow-skip-install that skips the smart contract installation phase.

Existing issues

Issue #1589 - Caliper ethereum documentation needs a complete overhaul

Design of the fix

  • Added information on how to use the --caliper-flow-skip-install to use pre-deployed contracts. Since the contract configuration on the network config file will differ depending on whether this flag is used, I added a subsection for each use case;
  • Added a warning regarding the mandatory usage of fromAddressSeed when using more than 1 worker;
  • Fixed name mismatches between the network config file keys;
  • Added information about the TxStatus type - getResut() was not documented;
  • Updated references to the old invokeSmartContract and queryState functions, with the new sendRequests function;
  • Moved besu-specific warnings to the appropriate sections;
  • Removed reference to a "special registry contract", which I haven't found any information about anywhere else.

@rmarede rmarede changed the title Ethereum connector documentation overhaul Caliper Ethereum documentation overhaul Jun 4, 2024
@davidkel
Copy link
Contributor

davidkel commented Jun 6, 2024

@rmarede Many thanks for the contribution, I've asked @aklenik to take a look as he has more knowledge than me in this area but it looks good to me so far.

@davidkel
Copy link
Contributor

davidkel commented Jun 7, 2024

Going to try closing and re-opening to see if it fixes the DCO issue

@davidkel davidkel closed this Jun 7, 2024
@davidkel davidkel reopened this Jun 7, 2024
@davidkel
Copy link
Contributor

davidkel commented Jun 7, 2024

@rmarede Due to a github problem where DCO wasn't recognised, could you try doing a force push to your PR to see if it now forces github to recognise the DCO please ?

@rmarede
Copy link
Contributor Author

rmarede commented Jun 7, 2024

@davidkel I amended the last commit and force pushed it, seems like it worked

Signed-off-by: Rodrigo Arede <aredemiguel@gmail.com>
@rmarede rmarede force-pushed the #1589-ethereum-documentation-overhaul- branch from cad3400 to 6ba304d Compare June 7, 2024 11:18
Copy link
Contributor

@davidkel davidkel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a couple of minor issues here, looks really good. As this is relevant to the latest version of caliper, could you also take this and apply it to the v0.6.0 directory.
Really a great improvement to the docs, many thanks

docs/vNext/Ethereum_Configuration.md Outdated Show resolved Hide resolved
docs/vNext/Ethereum_Configuration.md Outdated Show resolved Hide resolved

For each key you must provide a JSON object with the `path` field pointing to the [contract definition file](#contract-definition-file).
> Defining configurations simultaneously for both pre-deployed contracts and contracts to be deployed by Caliper is currently **not supported** and may result in unexpected errors. This is because opting for pre-deployed contracts means the contract installation phase will be skipped.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the contract configuration, we still want to refer to the path property. It's required if you want to install the smart contract but not required if the contract is already deployed. This unfortunately was the only reference to path outside of the example

Copy link
Contributor Author

@rmarede rmarede Jun 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's also a reference to path in line 195, in the appropriate Contracts to Deploy section. Isn't that enough?

Contracts to Deploy

Contracts to be deployed by Caliper require the specification of a contract definition file for each. In the contract configuration you must include a path field pointing to each contract definition file. It's in this new file that you will define the contract's ABI and bytecode, as well as the gas required to deploy it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, must have missed that in the PR, sorry

Signed-off-by: Rodrigo Arede <aredemiguel@gmail.com>
@davidkel davidkel merged commit 09d0519 into hyperledger-caliper:gh-pages Jun 10, 2024
2 checks passed
@davidkel
Copy link
Contributor

@rmarede merged, thank you, really much appreciated

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants