Skip to content
Permalink
Browse files

Make choices point extensive and tabulate table

  • Loading branch information...
palas committed Apr 14, 2019
1 parent 22d297e commit 764980dd6df77988c3e59c64e98b8835bf60e592
Showing with 13 additions and 15 deletions.
  1. +13 −15 docs/tutorial-v1.3/checklist.md
@@ -24,29 +24,27 @@ The [overview](./differences.md) describes the differences between Marlowe 2.0 a

3. Expressions of type `Money` should be renamed to their corresponding expressions of type `Value`:

<table>
<tr><th>Marlowe 1.3</th><th>Marlowe 2.0</th></tr>
<tr><td>AvailableMoney</td><td>Committed</td></tr>
<tr><td>AddMoney</td><td>AddValue</td></tr>
<tr><td>ConstMoney</td><td>Constant</td></tr>
<tr><td>MoneyFromChoice</td><td>ValueFromChoice</td></tr>
</table>
<table>
<tr><th>Marlowe 1.3</th><th>Marlowe 2.0</th></tr>
<tr><td>AvailableMoney</td><td>Committed</td></tr>
<tr><td>AddMoney</td><td>AddValue</td></tr>
<tr><td>ConstMoney</td><td>Constant</td></tr>
<tr><td>MoneyFromChoice</td><td>ValueFromChoice</td></tr>
</table>

4. `Redeem` expressions in `Contract`:

The `Redeem` constructor has been removed, and it should be replaced by a `Pay` constructor. This will be a payment from the commitment to the person who made the commitment initially.

More details of how to construct payments in v2.0 are given in the previous item, but note that the extra information required will include an action id, a timeout, and a continuation to use if the timeout is exceeded.

5. `When` and `Choice` contracts.
5. Choices:

These are not changed at the top level, but `Observation` values within them are changed. In particular, choices are structured in a different way as described in the [overview document](./differences.md).

For example, the construct
`PersonChoseThis … per c`
becomes
`ChoseThis (idCH, per) c`
where `idCH` identifies the choice.
Identifiers for choices now include the choice and the participant as part of the identifier as described in the [overview document](./differences.md).
This affects `Observation`s and `Money` expressions that depend on choices:
* `PersonChoseThis idCh per c` becomes `ChoseThis (idCh, per) c`
* `PersonChoseSomething idCh per c` becomes `ChoseSomething (idCh, per) c`
* `MoneyFromChoice idCh per val` becomes `ValueFromChoice (idCh, per) val`

## Where to go to find out more

0 comments on commit 764980d

Please sign in to comment.
You can’t perform that action at this time.