Matthew Nesbit
7503ffc10a
Merged in mnesbit-cleanup-correct-shutdown-exceptions (pull request #333 )
...
Fix noisy exceptions in some tests during node stop.
2016-09-06 17:02:13 +01:00
Mike Hearn
e398b6e17b
Refactor common fields from WireTransaction/LedgerTransaction out into BaseTransaction. Put some field invariants into the constructors.
2016-09-06 17:30:52 +02:00
Matthew Nesbit
58aa933307
My recent PR#325 contained a couple of mistakes. In particular on Unix, but not windows the shutdown hook unregister can give a non-fatal exception during some tests. Also, I got the point of client messaging service stop registration wrong, which was leading to the server shutting down teh client session ahead of the proper stop sequence.
2016-09-06 16:26:31 +01:00
Andras Slemmer
63e2ec32cf
core: Suppress cast warnings
2016-09-06 15:18:41 +01:00
Andras Slemmer
0f29067680
contracts, core: Fix compiler errors
2016-09-06 14:30:03 +01:00
Andras Slemmer
9e993c5b86
Merged in aslemmer-generators-fixes (pull request #300 )
...
Aslemmer generators fixes
2016-09-06 14:19:28 +01:00
Mike Hearn
85c112f80d
Merged in mike-tx-types-refactoring-september (pull request #330 )
...
Small cleanups to the transaction types
2016-09-06 15:18:31 +02:00
Mike Hearn
f3fa54ebef
Minor: add field-level documentation to WireTransaction and TODO a few things that don't seem right.
2016-09-06 15:06:29 +02:00
Mike Hearn
8a19e6bbfb
Minor: delete dead code in SignedTransaction.verifySignatures as it's not required.
2016-09-06 15:06:28 +02:00
Mike Hearn
210ea2ed95
Minor: remove the TODO about the notary signing last. It is not important at this level as the notary signature does not cover the other signatures. Also a small formatting change to the withAdditionalSignatures methods.
2016-09-06 15:06:28 +02:00
Mike Hearn
99f8477bf1
Minor: move code from TransactionTools.kt into the respective classes, and add some @Throws annotations that were missing (matters for java users)
2016-09-06 15:06:28 +02:00
Andras Slemmer
618f46cba4
node: Fix JsonSupportTest imports
2016-09-06 13:59:01 +01:00
Andras Slemmer
bd59022e8f
Revert "core, contracts: Rewrite Generators to use functions instead of classes"
...
This reverts commit deddcc91c7f6ad436c44daf69b4cb81a406cb28e.
2016-09-06 13:54:59 +01:00
Andras Slemmer
abdc45176d
Revert "core: Small Generator fix"
...
This reverts commit c57731a978fe41f38b91dbe97dd1e1ddc9e274d1.
2016-09-06 13:54:59 +01:00
Andras Slemmer
fd3707fd24
core: Small Generator fix
2016-09-06 13:54:59 +01:00
Andras Slemmer
2ac31a53b5
core, contracts: Rewrite Generators to use functions instead of classes
2016-09-06 13:54:59 +01:00
Andras Slemmer
491b1abd4a
contracts, core, node: Use entropyToKeyPair in Generators instead of manually creating keys
2016-09-06 13:54:59 +01:00
Andras Slemmer
f11a587382
core, contracts: Add Generator<>.generateList to reduce boilerplate
2016-09-06 13:54:59 +01:00
Andras Slemmer
6faf19cccc
contracts: Add comment explaining Generators
2016-09-06 13:54:59 +01:00
Andras Slemmer
9ff1ad7769
node: Fix redelivery race
2016-09-06 13:54:58 +01:00
Andras Slemmer
5dfd3c7704
contracts: Remove superfluous pacakge names
2016-09-06 13:54:58 +01:00
Andras Slemmer
cc556cde6f
ndoe: Fix message duping on redelivery
2016-09-06 13:54:58 +01:00
Andras Slemmer
89a5448c39
node, core: Add quickcheck generators for basic types, transactions
2016-09-06 13:54:58 +01:00
Mike Hearn
f3c2bd6748
Minor: split Transactions.kt file into one file per transaction class
2016-09-06 14:21:37 +02:00
Mike Hearn
9d83a9b6d2
Minor: move transaction types out of the contracts package and into a new transactions package
2016-09-06 14:20:32 +02:00
Mike Hearn
cbf6aa0e27
Minor: make TransactionBuilder.signWith return the builder for ease of use from Java.
2016-09-06 14:20:32 +02:00
Mike Hearn
ad6c59d742
Minor: note in the DummyState doc that it's not a part of DummyContract despite the name.
2016-09-06 14:20:32 +02:00
Andrius Dagys
f3b4379e06
Merged in andrius-minor-transaction-cleanup (pull request #329 )
...
Minor TransactionBuilder cleanup
2016-09-06 13:14:07 +01:00
Andras Slemmer
220b3f9043
Merged in aslemmer-fix-clockutils-race (pull request #328 )
...
fix clockutils race
2016-09-06 11:48:08 +01:00
Andrius Dagys
9cccb11967
Add comment explaining signers
2016-09-06 10:07:08 +01:00
Andras Slemmer
4923e33a7d
node: Remove unnecessary @Suppress
2016-09-06 09:52:43 +01:00
Andras Slemmer
737fc0589c
node: Add clock test for external interrupt on waiting strand
2016-09-06 09:52:43 +01:00
Andras Slemmer
fc7000c152
node: Fix race in Clock.doInterruptibly by not relying on version counter
2016-09-06 09:52:43 +01:00
Rick Parker
ac35673074
Merged in irs-demo-against-standalone (pull request #326 )
...
Allow IRS demo to be executed against standalone nodes by adding rates upload as a role so doesn't need to be done by node launcher, but can instead be run independently from the command line.
2016-09-06 09:47:17 +01:00
Matthew Nesbit
c6d16ea609
Merged in mnesbit-cleanup-shutdown-in-reverse-order (pull request #325 )
...
Shutdown node components in reverse order to startup
2016-09-06 09:32:58 +01:00
Matthew Nesbit
11efe8ca1b
Extend Rick's closeOnShutdown so that all the shutdown that was being done manually is done through the same mechanism. Thus allowing for a consistent reverse ordering and hopefully preventing DB shutdown happening ahead of serverThread shutdown.
...
Follow Rick's PR suggestions
Preserve comment about abitrary timeout on serverThread stop
2016-09-06 09:18:59 +01:00
rick.parker
240c403091
Allow IRS demo to be executed against standalone nodes by adding rates upload as a role so doesn't need to be done by node launcher, but can instead be run independently from the command line.
2016-09-06 08:24:02 +01:00
Andrius Dagys
2676e8878d
Remove a @Deprecated as the code has been changed since its introduction anyway
2016-09-05 18:50:53 +01:00
Andrius Dagys
84247128b4
Remove addInputState(stateRef, notary) from TransactionBuilder API, as it might lead to issues where someone accidentally provides a different notary than the one in the state
2016-09-05 18:47:51 +01:00
Andrius Dagys
aa166518a0
Remove unused val
2016-09-05 18:41:35 +01:00
Andras Slemmer
cb467e55de
Merged in aslemmer-driver-dont-use-localhost (pull request #327 )
...
node-driver: Use anyAddress for RandomFree port allication
2016-09-05 18:30:28 +01:00
Andras Slemmer
d8ae07e771
node-driver: Use anyAddress for RandomFree port allication
2016-09-05 17:29:44 +01:00
Andras Slemmer
9836edd191
Revert reuseaddr
2016-09-05 16:08:58 +01:00
Roger Willis
a4d2b28b6b
Merged in rog-timeout-patch (pull request #322 )
...
waitForNodeStartup should now throw after 2 minutes rather than 20 seconds. Some bank devs were finding integration tests failing as nodes had still not started...
Added getFreeLocalPorts() for grabbing more than one port. Fixes bug in freeLocalHostAndPort() where the same port can be picked multiple times.
In README.md instruct users to grab IntelliJ16 instead of 15.
2016-09-05 16:06:05 +01:00
Andras Slemmer
da34be752a
Merged in aslemmer-remove-reuse-addr (pull request #324 )
...
node-driver: Remove reuseAddress = true as it breaks tests on osx
2016-09-05 15:43:27 +01:00
Andras Slemmer
6b37048a14
node-driver: Remove reuseAddress = true as it breaks tests on osx
2016-09-05 15:43:19 +01:00
Shams Asari
97e1a59770
Refactored FiberRequest into cleaner ProtocolIORequest and fixed checkpoint regression
2016-09-05 14:42:54 +01:00
Matthew Nesbit
a2d7490902
Merged in mnesbit-cleanup-protect-double-stop (pull request #323 )
...
Some integration tests seem to be getting exceptions that suggest the ArtemisMQ session has been closed twice.
2016-09-05 14:27:38 +01:00
Matthew Nesbit
eb8510e7cc
Some integration tests seem to be getting exceptions that suggest the ArtemisMQ session has been closed down already. Looking at the client code it is clear two threads can call stop and interfere with each other. Therefore this fixes the running flag logic.
2016-09-05 14:13:38 +01:00
Andras Slemmer
ea3c63e023
Merged in mike-so-reuseaddr (pull request #321 )
...
Testing: Make PortAllocation set SO_REUSEADDR to avoid CI conflicts
2016-09-05 12:24:52 +01:00
