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.

Sign up for GitHub

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

Jump to bottom

SCP-2744 - ACTUS contracts in Marlowe, more refactoring #3981

Merged
merged 24 commits into from
Sep 24, 2021
Merged

SCP-2744 - ACTUS contracts in Marlowe, more refactoring #3981

merged 24 commits into from
Sep 24, 2021

Conversation

yveshauser
Copy link
Contributor

@yveshauser yveshauser commented Sep 23, 2021 •
edited

Pre-submit checklist:

  • Branch
    • Tests are provided (if possible)
    • Commit sequence broadly makes sense
    • Key commits have useful messages
    • Relevant tickets are mentioned in commit messages
    • Formatting, materialized Nix files, PNG optimization, etc. are updated
  • PR
    • Self-reviewed the diff
    • Useful pull request description
    • Reviewer requested

@yveshauser
scp-2744 - illustrative examples for ACTUS contracts
6f67e20
@yveshauser
scp-2744 - removed unnecessary field in ACTUS contract terms
69a8f15
@yveshauser
scp-2744 - ACTUS examples from README as test cases
4905d97
@yveshauser
scp-2744 - don't suppress warnings
416c62e
@yveshauser
scp-2744 - ACTUS test cases into separate module
a4e7dbb
@yveshauser
scp-2744 - ACTUS test cases into separate module
76c8077
@yveshauser
scp-2744 - split test cases into separate groups
a4bb2e3
@yveshauser
scp-2757 - Using LocalTime instead of Day
b5c2521
@yveshauser
scp-2744 - ACTUS contract generator
9178358 
* don't generate an 'invoice' when the amount is 0
@yveshauser
scp-2745 - syntax
310079c
@yveshauser
scp-2745 - applicability checks for ACTUS contract tests
4b8f75b 
* applying applicability rules to the examples
@yveshauser
scp-2757 - Using LocalTime instead of Day
6f4eff5
@yveshauser
scp-2744, scp-2745 - Marlowe contract generation for ACTUS contract
6790dd1 
terms

* applicability for examples in test directory
* minor cleanups
* documentation
@yveshauser
scp-2744 - generic ACTUS contract terms
ed0aa0f
@yveshauser
scp-2744 - generic entry points into ACTUS model
9241698
@yveshauser
scp-2744 - minor adjustments
7f29371
@yveshauser
scp-2744 - move ACTUS type definitions
ea96b5b
@yveshauser
scp-2744 - more generic ACTUS contracts implementation
9700ea6
@yveshauser
scp-2744 - update materialized nix files
9abeb81
@yveshauser
scp-2744 - commented NAM and ANN test cases - pull request still open
2406f21 
actusfrf/actus-tests#1
@yveshauser
scp-2744 - ContractTerms for ACTUS contracts changed
4473f28
@yveshauser yveshauser self-assigned this Sep 23, 2021
@yveshauser yveshauser force-pushed the scp-2744-actus-contracts-in-marlowe branch from dc8f964 to 7a0400a Compare September 23, 2021 18:08
palas
palas approved these changes Sep 23, 2021
View reviewed changes
Copy link
Contributor

@palas palas left a comment

Choose a reason for hiding this comment

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

Looks good 👍

marlowe-actus/src/Language/Marlowe/ACTUS/Model/SCHED/ContractScheduleModel.hs Show resolved Hide resolved
@yveshauser yveshauser merged commit ee57f39 into master Sep 24, 2021
@yveshauser yveshauser deleted the scp-2744-actus-contracts-in-marlowe branch September 24, 2021 12:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@palas palas palas approved these changes

Assignees

@yveshauser yveshauser

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@yveshauser @palas