Mike Hearn
0d9f5a955b
Minor: fix IntelliJ build config so it runs tests in submodules too.
2016-02-24 14:49:25 +01:00
Mike Hearn
fb962399ca
Merged in PLT-68-protocol-progress (pull request #23 )
...
Progress framework for protocols
2016-02-24 12:59:22 +01:00
Mike Hearn
478b6c5fba
Trader demo: use a start script instead of Gradle, which simplifies setup.
...
It also stops Gradle messing with the console output.
2016-02-24 12:58:37 +01:00
Mike Hearn
c3f86f6557
Integrate a simple progress tracking system into the protocol framework.
...
The progress tracker API lets you model a tree of steps, along the same structure as protocols and subprotocols. Each step has an (optionally changing) label, and thus progress trackers can be arranged in a tree. Updates to the progress at each level flow up the tree via an RxJava observable (I guess we will use this more in future).
A simple console renderer is provided that uses ANSI escapes and Emoji to show animated progress through a protocol.
The trader demo is enhanced to use this framework, when run outside of Gradle.
2016-02-24 12:58:37 +01:00
Mike Hearn
ab2b447a5e
Minor: add a TransientProperty utility class.
...
It makes it a bit easier to define properties that don't survive serialisation and are reconstructed each time.
2016-02-23 18:28:06 +01:00
Mike Hearn
96eacfeda8
Minor: another emoji
2016-02-23 18:28:06 +01:00
Mike Hearn
c35d7794d8
Minor: make BriefLogFormatter.initVerbose take a set of flags saying what logging to activate vs silence.
2016-02-23 18:28:06 +01:00
Mike Hearn
6c4825aeb2
Minor: fix typo in file name
2016-02-23 18:28:06 +01:00
Mike Hearn
9de104df7b
Refactor the protocol framework out into separate files.
2016-02-23 18:28:06 +01:00
Richard Green
9b28521389
Merged in rg_codeadmin_wip (pull request #22 )
...
Minor: Moved JavaCommercialPaper.java from src/main... to contracts/src/main
2016-02-23 15:58:34 +00:00
Richard Green
bc8962b0dc
Minor: Moved JavaCommercialPaper.java from src/main... to contracts/src/main
2016-02-23 14:14:01 +00:00
Mike Hearn
7832fd0f93
Merged in PLT-61-resolve-deps (pull request #21 )
...
Resolve and verify transaction dependencies, many other improvements
2016-02-23 12:31:00 +01:00
Mike Hearn
027068b998
Minor: version -> "latest" in docsite
2016-02-18 17:55:11 +01:00
Mike Hearn
d420b1e785
Minor: widen the doc area in the docsite by 200px, stops code overflowing and results in more space for text.
2016-02-18 17:54:41 +01:00
Mike Hearn
ba62330a6e
Minor: fix a small bug in the tutorial.rst doc file
2016-02-18 17:47:20 +01:00
Mike Hearn
02f5dc5948
Update the protocol framework documentation
2016-02-18 17:47:05 +01:00
Mike Hearn
adda2bbe6b
Minor: move ExcessivelyLargeTransactionGraph exception into the right place
2016-02-18 17:29:44 +01:00
Mike Hearn
54a73166c3
Merge branch 'master' into PLT-61-resolve-deps
2016-02-18 17:22:35 +01:00
Mike Hearn
f6167cbe12
Minor: tweak build file to describe how to activate Dokka API docs
2016-02-18 13:43:15 +01:00
Mike Hearn
1243ca2066
Trading: in the two party trade protocol, check that the proposed transaction is contract-valid, and that the missing signatures are what is expected.
2016-02-17 18:38:24 +01:00
Mike Hearn
cd28733360
Major: Separate out the dep resolution protocol into a couple of sub protocols and use on both sides of the trade.
...
* Dependency resolution/checking is now working on both sides of the two party trading protocol.
* The commercial paper contract was changed to check timestamping authority identities by name instead of key.
* The trader demo has been rewritten to use the protocol framework, which simplifies the code.
2016-02-17 18:11:37 +01:00
Mike Hearn
eb47d8af4d
Minor: Unit testing: allow a subset of transactions in a group to be signed.
2016-02-17 17:19:37 +01:00
Mike Hearn
bdadaffbc0
Minor: Logging of how many transactions were validated in TransactionGroup.verify()
2016-02-17 17:19:37 +01:00
Mike Hearn
58e84fbeca
Minor: Unit testing: InMemoryNetwork.Node.stop, running = false after thread shutdown not before.
2016-02-17 17:19:36 +01:00
Mike Hearn
55989a8e92
Minor: add logging to the RecordingMap unit test utility
2016-02-17 17:19:36 +01:00
Mike Hearn
b2b51183b8
Minor: logging - allow multiple package specs to be passed to BriefLogFormatter.initVerbose()
2016-02-17 17:19:36 +01:00
Mike Hearn
299e1af15e
Protocol frameworks: separate the fiber object from the logic object to make it easier to compose subprotocols together.
2016-02-17 17:19:36 +01:00
Mike Hearn
dc520392b8
Protocol framework: tweak error handling a bit and add unit test for it.
2016-02-17 17:19:36 +01:00
Mike Hearn
df4d926bca
First pass at implementing dependency resolution and checking in the two-party trade protocol.
...
This commit is incomplete: only the seller side currently checks. The code will be refactored out into subprotocols in further commits.
Note that timeouts are currently unhandled.
2016-02-17 17:19:36 +01:00
Mike Hearn
f92455442d
Minor: Unit testing: don't always require a lambda when running the network synchronously.
2016-02-17 17:19:36 +01:00
Mike Hearn
40d9b7686b
Minor: tweak IntelliJ run configs so trader demo nodes check Quasar instrumentation when run in IntelliJ
2016-02-17 17:19:36 +01:00
Mike Hearn
ed72e9b997
Unit tests: fix a couple of threading issues for async unit tests that use the in memory network
2016-02-16 17:39:08 +01:00
Mike Hearn
de4427c240
Minor: add a few utilities for working with listenable futures
2016-02-16 17:39:02 +01:00
Mike Hearn
1f8fd4b578
Kotlin 1.0 (huzzah)
2016-02-16 17:26:12 +01:00
Mike Hearn
8c72f68736
Minor: fix a minor merge issue that broke pretty output in the trader demo
2016-02-16 17:17:15 +01:00
Sofus Mortensen
994abb3edb
Added new project core.
...
Project Contracts depends only on core.
2016-02-16 17:14:17 +01:00
Sofus Mortensen
00977c0d83
build.gradle edited online with Bitbucket
2016-02-16 17:14:17 +01:00
Sofus Mortensen
e34731bad7
Sorting of files. Create build.gradle in contracts. Comments.
2016-02-16 17:14:17 +01:00
Sofus Mortensen
cbfcac994a
New separate project for contracts. Canonicalization.
2016-02-16 17:14:17 +01:00
Mike Hearn
8bd54dfc74
Merged in tests-with-signing-improvements (pull request #19 )
...
Improve unit tests to support signatures, refactor transaction classes a bit
2016-02-12 20:01:55 +01:00
Mike Hearn
a01746a04b
Minor: use DummyTimestampingAuthority key/identity in the InMemoryNetwork
2016-02-12 16:50:44 +01:00
Mike Hearn
b7fd0ce0ed
Minor: move InMemoryNetwork to tests directory
2016-02-12 16:47:45 +01:00
Mike Hearn
9f4897f7c4
Simplifies two-party trade protocol to return SignedTransaction instead of a pair of other forms.
2016-02-12 15:49:18 +01:00
Mike Hearn
6deef5b598
Minor: rename SignedWireTransaction to just SignedTransaction
2016-02-12 15:47:23 +01:00
Mike Hearn
a42d7e64ef
Minor: add a TODO to Kryo.kt about lazy properties.
2016-02-12 15:41:36 +01:00
Mike Hearn
ea18e239d9
Testing: rework TransactionGroupDSL to work with WireTransactions instead of LedgerTransactions and simplify original hash/serialised bits tracking.
2016-02-12 15:41:22 +01:00
Mike Hearn
fc000ec03c
Testing: more utilities on Transaction and TransactionGroupForTest to help with testing signed transactions.
2016-02-12 14:55:11 +01:00
Mike Hearn
48192d8d9d
Merged in PLT-60-misc-code-cleanups (pull request #17 )
...
Misc code cleanups
2016-02-10 17:59:53 +01:00
Mike Hearn
5b473be79c
Minor: fix test breakage under Gradle due to some horrible stuff Gradle does with injecting things into our environment.
2016-02-10 17:59:28 +01:00
Mike Hearn
ae6309a113
Minor: make SecureHash c'tor private so it's not possible to instantiate directly.
2016-02-10 17:59:28 +01:00
