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

DAML-LF: factorize ScenarioNodeId and EventId #6256

Merged
merged 4 commits into from
Jun 8, 2020

Conversation

remyhaemmerle-da
Copy link
Collaborator

@remyhaemmerle-da remyhaemmerle-da commented Jun 8, 2020

Sandbox and Scenario-service share the notion of ScenarioNodeId and EventId but used different type.

This PR makes the sharing explicit but dropping the ScenarioNodeId and using a common EventId
that also make explicit the TransactionId and NodeId component in the EventId.

Pull Request Checklist

  • Read and understand the contribution guidelines
  • Include appropriate tests
  • Set a descriptive title and thorough description
  • Add a reference to the issue this PR will solve, if appropriate
  • Include changelog additions in one or more commit message bodies between the CHANGELOG_BEGIN and CHANGELOG_END tags
  • Normal production system change, include purpose of change in description

NOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with /AzurePipelines run to
trigger the build.

@remyhaemmerle-da remyhaemmerle-da requested a review from a user June 8, 2020 09:48
@remyhaemmerle-da remyhaemmerle-da added component/daml-engine DAML-LF Engine & Interpreter component/daml-lf DAML-LF component/ledger Sandbox and Ledger API and removed component/daml-engine DAML-LF Engine & Interpreter labels Jun 8, 2020
@remyhaemmerle-da remyhaemmerle-da force-pushed the remy-drop-scenarion-node-id branch from 6070905 to 4763831 Compare June 8, 2020 09:51
@remyhaemmerle-da remyhaemmerle-da added this to the Maintenance milestone Jun 8, 2020
CHANGELOG_BEGIN
CHANGELOG_END
@remyhaemmerle-da remyhaemmerle-da force-pushed the remy-drop-scenarion-node-id branch from 4763831 to 4fd18d9 Compare June 8, 2020 09:56
Copy link
Contributor

@stefanobaghino-da stefanobaghino-da left a comment

Choose a reason for hiding this comment

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

LGTM but I'm a bit concerned about having //daml-lf/interpreter as a direct dependency of the sandbox.

@@ -225,6 +225,7 @@ da_scala_library(
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_java_proto",
"//daml-lf/data",
"//daml-lf/interpreter",
Copy link
Contributor

Choose a reason for hiding this comment

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

//daml-lf/interpreter is where Speedy lives, right? Does it make sense for it to be a direct dependency of the sandbox? Any chance we can keep those separated?

Copy link
Collaborator Author

@remyhaemmerle-da remyhaemmerle-da Jun 8, 2020

Choose a reason for hiding this comment

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

Moving into the sandbox in the current state, it is clearly not an option.
However, If you are keen on dropping this dependency, I could move the data type definition in "//daml-lf/transaction" (which is a fair dependency) in an upcoming PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

Makes sense thanks, I created #6260 so that you can use it to track it in the the upcoming PR you mentioned.

@ghost ghost removed the request for review from SamirTalwar June 8, 2020 10:11
@remyhaemmerle-da remyhaemmerle-da merged commit d064ea4 into master Jun 8, 2020
@remyhaemmerle-da remyhaemmerle-da deleted the remy-drop-scenarion-node-id branch June 8, 2020 14:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/daml-lf DAML-LF component/ledger Sandbox and Ledger API
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants