Mike Hearn
|
bbc5c2e981
|
Merged in mike-july-dependency-upgrades (pull request #200)
Upgrade dependencies, July edition.
|
2016-07-06 16:25:52 +01:00 |
|
Mike Hearn
|
ffa32f21cd
|
Merged in mike-small-fixes (pull request #205)
Small fixes
|
2016-07-06 16:25:27 +01:00 |
|
Mike Hearn
|
2e3f689fd3
|
Minor: fix PublicKey.toShortString after the switch to ed25519
|
2016-07-06 16:04:10 +01:00 |
|
Mike Hearn
|
9e849378cf
|
Minor: add some assertions in the WalletFiller code after a test was observed to fail due to a negative amount.
|
2016-07-06 14:02:40 +01:00 |
|
Mike Hearn
|
f6e7ffdd31
|
Fix a race condition in the MockNode class that only shows up when used in thread-per-node mode. Witnessed in the unit tests.
|
2016-07-06 14:02:40 +01:00 |
|
Mike Hearn
|
6fb7e59b91
|
Upgrade dependencies, July edition.
|
2016-07-06 13:56:22 +01:00 |
|
Andras Slemmer
|
c38f99419f
|
Merged in unified-test-dsl (pull request #203)
Unified test dsl
|
2016-07-06 13:30:59 +01:00 |
|
Andras Slemmer
|
0cf54d1c1f
|
test dsl: Comment full stops
|
2016-07-06 13:25:08 +01:00 |
|
Andras Slemmer
|
26d8973746
|
test dsl: Add TODO on type synonyms
|
2016-07-06 13:25:08 +01:00 |
|
Andras Slemmer
|
f177b1ffaa
|
test dsl: LastLineShouldTestForVerifiesOrFails->EnforceVerifyOrFail
|
2016-07-06 13:25:08 +01:00 |
|
Andras Slemmer
|
e31b769fef
|
test dsl: Dsl->DSL, add top-level transaction primitive, add ledger-embedded signAll, other cosmetics
|
2016-07-06 13:25:08 +01:00 |
|
Andras Slemmer
|
e3d6f51049
|
contracts, core, node: Port TransactionForTest tests to new DSL
|
2016-07-06 13:25:08 +01:00 |
|
Andras Slemmer
|
a27f195b4f
|
core: Add LastLineShouldBeVerifiesOrFails, fix attachment primitive, Java interop
|
2016-07-06 13:25:08 +01:00 |
|
Andras Slemmer
|
bdda3d239a
|
contracts: Port Java CashTests to new DSL
|
2016-07-06 13:25:08 +01:00 |
|
Andras Slemmer
|
7634331f68
|
contracts: Port CashTests to new dsl
|
2016-07-06 13:25:08 +01:00 |
|
Andras Slemmer
|
f4a6a43aa6
|
contracts, core: Port CommercialPaperTests, IRSTests, ObligationTests, TransactioGroupTests
|
2016-07-06 13:25:08 +01:00 |
|
Andras Slemmer
|
cb47e00feb
|
core: Add convenience input(), remove TransactionGroupDSL
|
2016-07-06 13:25:08 +01:00 |
|
Andras Slemmer
|
cde315aca9
|
contracts, node: Port CommercialPaperTests, TwoPartyTradeProtocolTests and GroupToGraphConversion to use new dsl
|
2016-07-06 13:25:08 +01:00 |
|
Andras Slemmer
|
9b36df607e
|
core: Remove binding of State type in test dsl
|
2016-07-06 13:25:08 +01:00 |
|
Andras Slemmer
|
4a89be8785
|
build: Run integtests after regular ones
|
2016-07-06 13:25:08 +01:00 |
|
Andras Slemmer
|
bf4272b64a
|
core: transaction/ledger DSL interfaces and implementation for tests
|
2016-07-06 13:25:08 +01:00 |
|
Shams Asari
|
5c0e7fbbf2
|
Moved topic parameter from send/receive methods to a ProtocolLogic property
|
2016-07-05 15:12:25 +01:00 |
|
Mike Hearn
|
4356cef1cd
|
Regen docsite
|
2016-06-30 14:49:28 +02:00 |
|
Ross Nicoll
|
f2185089b7
|
Merged in rnicoll-cash-asset (pull request #197)
Rename com.r3cord.contracts.cash package to ...asset
|
2016-06-30 13:38:25 +01:00 |
|
Ross Nicoll
|
2121824662
|
Rename com.r3cord.contracts.cash package to ...asset
|
2016-06-30 13:31:59 +01:00 |
|
Ross Nicoll
|
a30a6cb389
|
Merged in rnicoll-obligation-cash-asset (pull request #195)
Replace references to cash, with (fungible) asset
|
2016-06-30 12:47:49 +01:00 |
|
Ross Nicoll
|
6dad7efa22
|
Replace references to cash, with (fungible) asset
|
2016-06-30 12:47:18 +01:00 |
|
Shams Asari
|
a02263937c
|
send and sendAndReceive use Party for the destination
|
2016-06-30 12:04:39 +01:00 |
|
Mike Hearn
|
aef111114f
|
Merged in mike-m1-docs-refresh (pull request #196)
Refresh docs for M1 release.
|
2016-06-30 13:01:07 +02:00 |
|
Mike Hearn
|
15a135f648
|
Merged master into mike-m1-docs-refresh
|
2016-06-30 13:00:34 +02:00 |
|
Mike Hearn
|
63cc3a04ce
|
Review feedback
|
2016-06-30 12:59:19 +02:00 |
|
Andrius Dagys
|
b30e431766
|
Update release notes regarding use of TransactionBuilder
|
2016-06-30 11:46:26 +01:00 |
|
Andras Slemmer
|
9e174d3e3a
|
irsdemo: Fix api address in Date role
|
2016-06-30 11:30:05 +01:00 |
|
Mike Hearn
|
55675ef799
|
Refresh docs for M1 release.
|
2016-06-30 12:23:27 +02:00 |
|
Rick Parker
|
4213da31b2
|
Merged in cor-133-events-modelling (pull request #132)
Scheduled activities / events support
|
2016-06-30 09:11:37 +01:00 |
|
rick.parker
|
5271882dcd
|
Event scheduling and docs for event scheduling
|
2016-06-30 08:51:52 +01:00 |
|
Ross Nicoll
|
b3af0ce218
|
Merged in rnicoll-upgrade-infrastructure (pull request #193)
Infrastructure ahead of contract upgrade support
|
2016-06-29 17:26:44 +01:00 |
|
Ross Nicoll
|
11eff398a0
|
Minor: Typo (classfiles -> class files)
|
2016-06-29 17:16:47 +01:00 |
|
Ross Nicoll
|
c767638127
|
Move DummyContract.State into its own file
DummyContract.State isn't actually used by the DummyContract any more, so shouldn't
be part of that contract class.
|
2016-06-29 17:16:46 +01:00 |
|
Ross Nicoll
|
779034691e
|
Add AbstractTransactionSubstitutionProtocol
Abstracts the NotaryChangeProtocol to be extensible for other use-cases.
|
2016-06-29 17:16:46 +01:00 |
|
Andrius Dagys
|
dd9a653ab4
|
TransactionBuilder: added a comment explaining the default notary parameter purpose
|
2016-06-29 16:32:29 +01:00 |
|
Andras Slemmer
|
d29dd121ff
|
integtest: Change timestamp format to be compatible with Windows
|
2016-06-29 13:58:19 +01:00 |
|
Ross Nicoll
|
22e5a5dddc
|
Merged in rnicoll-warnings (pull request #192)
Remove warnings from Obligation contract
|
2016-06-29 13:49:05 +01:00 |
|
Ross Nicoll
|
dc304199c8
|
Remove warnings from Obligation contract
|
2016-06-29 13:27:00 +01:00 |
|
Rick Parker
|
549a72bf77
|
Merged in fix-zip-path (pull request #191)
Fix up bug in attachment Zip file processing when path might not be normalised to start with
|
2016-06-29 09:26:33 +01:00 |
|
rick.parker
|
cfe54c5f21
|
Fix up bug in attachment Zip file processing when path might not be normalised to start with
|
2016-06-29 09:10:18 +01:00 |
|
Andras Slemmer
|
d17e649137
|
integtest: Double polling retry count
|
2016-06-28 17:55:04 +01:00 |
|
Andras Slemmer
|
5eefbaf622
|
Merged in add-integrationTest-to-test (pull request #190)
build: add integrationTest as a test dependency
|
2016-06-28 17:31:41 +01:00 |
|
Andras Slemmer
|
2daa8098c9
|
build: add integrationTest as a test dependency
|
2016-06-28 16:46:45 +01:00 |
|
Mike Hearn
|
93ea1db17c
|
Merged in irsdemotest (pull request #136)
Added integration build step and created two integration tests (IRS Demo and Trader Demo tests)
|
2016-06-28 17:37:32 +02:00 |
|