Extend hard-coded test blockchain to test collateral inputs and outputs. #3346
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Great level of explanation 👍 My only comment is that there seems to be a lot of places where we need to update this logic of |
sevanspowell
approved these changes
Jun 21, 2022
I do agree. I'm planning to make a subsequent PR that removes the duplication, at least within the test suite. |
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
Jun 21, 2022
3346: Extend hard-coded test blockchain to test collateral inputs and outputs. r=jonathanknowles a=jonathanknowles ## Issue Number ADP-1814 ## Summary This PR extends the hard-coded test blockchain in `ModelSpec` (an excerpt of the mainnet blockchain). It appends a pair of transactions to the end: (and ensures that all tests pass) - Transaction `t0`: - marked as **_failing_** script validation - specifies a single collateral input `cinp_0` - specifies a single collateral output `cout_0` - Transaction `t1`: - marked as **_passing_** script validation - specifies a single ordinary input that refers to `cout_0` of `t0` ## Details The first commit in this PR is marked with `[FAIL]`, as it causes a test failure in "_applyBlock matches the basic model from the specification_". The cause of this failure is that the following **_test_** functions were not updated to account for script validation: - `ModelSpec.updateUTxO` - `ModelSpec.txOutsOurs` Subsequent commits adjust these functions to correctly account for script validation. The first commit to result in a passing test suite is marked with `[PASS]`. Co-authored-by: Jonathan Knowles <[email protected]>
|
bors cancel |
|
Canceled. |
|
@sevanspowell I've added some commits that reduce the duplication within |
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
Jun 21, 2022
3346: Extend hard-coded test blockchain to test collateral inputs and outputs. r=jonathanknowles a=jonathanknowles ## Issue Number ADP-1814 ## Summary This PR extends the hard-coded test blockchain in `ModelSpec` (an excerpt of the mainnet blockchain). It appends a pair of transactions to the end: (and ensures that all tests pass) - Transaction `t0`: - marked as **_failing_** script validation - specifies a single collateral input `cinp_0` - specifies a single collateral output `cout_0` - Transaction `t1`: - marked as **_passing_** script validation - specifies a single ordinary input that refers to `cout_0` of `t0` ## Details The first commit in this PR is marked with `[FAIL]`, as it causes a test failure in "_applyBlock matches the basic model from the specification_". The cause of this failure is that the following **_test_** functions were not updated to account for script validation: - `ModelSpec.updateUTxO` - `ModelSpec.txOutsOurs` Subsequent commits adjust these functions to correctly account for script validation. The first commit to result in a passing test suite is marked with `[PASS]`. Co-authored-by: Jonathan Knowles <[email protected]>
|
Build failed: Failure log: |
…ation.
This commit extends the 'ModelSpec' test blockchain (an excerpt of the
real mainnet blockchain) with a transaction that is marked as having an
invalid script.
When processing this transaction, the wallet software should:
- spend inputs within the 'collateralInputs' field
(i.e., remove entries for "owned" inputs from the wallet's UTxO set)
- create outputs within the 'collateralOutput' field
(i.e., insert entries for "owned" outputs into the wallet's UTxO set)
This commit causes the following test failure:
```
Cardano.Wallet.Primitive.Model
Compare Wallet impl. with Specification
applyBlock matches the basic model from the specification [x]
Failures:
test/unit/Cardano/Wallet/Primitive/ModelSpec.hs:221:9:
1) Cardano.Wallet.Primitive.Model, Compare Wallet impl. with Specification,
applyBlock matches the basic model from the specification
Falsified (after 3 tests and 1 shrink):
WalletState
{ _ourAddresses = fromList [82d81858...aebb3709]
, _discoveredAddresses = fromList []
}
- input: 1st 39633666
output:
address: 82d81858...aebb3709
coin: 3823755.953610
tokens: []
- input: 2nd 74782d63
output:
address: 82d81858...aebb3709
coin: 19999.799999
tokens: []
/= []
```
Previously, the collateral inputs were omitted. This commit does not yet fix the test failure within `ModelSpec`.
We fix the testing function `updateUTxO` to spend the correct set of inputs, based on whether or not the transaction is marked as having failed script validation. On its own, this commit is not enough to fix `ModelSpec` tests that use the test blockchain.
We fix the testing function `txOutsOurs` to create the correct set of outputs, based on whether or not the transaction is marked as having failed script validation. This commit fixes `ModelSpec` tests that use the test blockchain.
This transaction is expected to spend a collateral ouput that was created by a previous transaction, where the previous transaction was marked as having failed script validation.
jonathanknowles
force-pushed
the
jonathanknowles/ADP-1814
branch
from
231177b to
991063f
Compare
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
Jun 21, 2022
3346: Extend hard-coded test blockchain to test collateral inputs and outputs. r=jonathanknowles a=jonathanknowles ## Issue Number ADP-1814 ## Summary This PR extends the hard-coded test blockchain in `ModelSpec` (an excerpt of the mainnet blockchain). It appends a pair of transactions to the end: (and ensures that all tests pass) - Transaction `t0`: - marked as **_failing_** script validation - specifies a single collateral input `cinp_0` - specifies a single collateral output `cout_0` - Transaction `t1`: - marked as **_passing_** script validation - specifies a single ordinary input that refers to `cout_0` of `t0` ## Details The first commit in this PR is marked with `[FAIL]`, as it causes a test failure in "_applyBlock matches the basic model from the specification_". The cause of this failure is that the following **_test_** functions were not updated to account for script validation: - `ModelSpec.updateUTxO` - `ModelSpec.txOutsOurs` Subsequent commits adjust these functions to correctly account for script validation. The first commit to result in a passing test suite is marked with `[PASS]`. Co-authored-by: Jonathan Knowles <[email protected]>
|
Build failed: Lots of cached failures with the same error as #3346 (comment). I'm fairly sure that this PR isn't the cause, because |
|
bors r+ |
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue Number
ADP-1814
Summary
This PR extends the hard-coded test blockchain in
ModelSpec(an excerpt of the mainnet blockchain).It appends a pair of transactions to the end: (and ensures that all tests pass)
Transaction
t0:cinp_0cout_0Transaction
t1:cout_0oft0Details
The first commit in this PR is marked with
[FAIL], as it causes a test failure in "applyBlock matches the basic model from the specification".The cause of this failure is that the following test functions were not updated to account for script validation:
ModelSpec.updateUTxOModelSpec.txOutsOursSubsequent commits adjust these functions to correctly account for script validation. The first commit to result in a passing test suite is marked with
[PASS].