Matthew Nesbit
245d6ce21f
Use standalone Corda main class and configuration in the Driver, rather than a separate class.
...
Better check for Notary services
2016-09-08 12:44:12 +01:00
Mike Hearn
d8d639f192
Merged in mike-small-tweaks (pull request #337 )
...
A few small tweaks
2016-09-08 12:40:14 +02:00
Matthew Nesbit
1f2a6d256e
Simplify the FullNodeConfiguration now that an explicit identity for the NetworkMapService isn't a problem.
...
Use consistent if style
Don't include NetworkMapAddress in config if hosting locally
2016-09-07 15:35:50 +01:00
Mike Hearn
fa4b503f81
Minor: rename UntrustworthyData.validate to UntrustworthyData.unwrap to better indicate its purpose and deprecate the old name.
2016-09-07 13:09:39 +02:00
Mike Hearn
49a0fd8fdd
Improve the usability of SignedTransaction.verifySignatures taking into account how it is typically used.
2016-09-07 13:09:39 +02:00
Mike Hearn
1d272f89c2
Check the tx type in NotaryChangeProtocol and add a TODO to write a test for this once the protocol framework propagates exceptions.
2016-09-07 13:09:39 +02:00
Matthew Nesbit
2e1952a8a7
Get rid of the fake NodeInfo used to identify the NetworkMapService node.
...
Remove old comment
2016-09-06 18:25:12 +01:00
rick.parker
35274cd15c
Refactor network map service in preparation for persistence.
...
Removed currently superfluous clock.
2016-09-06 18:21:06 +01:00
Mike Hearn
2d40c7e6dc
Minor: make the logger in the standalone node private to avoid accidental screwups due to name conflicts (mental or read)
2016-09-06 18:40:39 +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
9e993c5b86
Merged in aslemmer-generators-fixes (pull request #300 )
...
Aslemmer generators fixes
2016-09-06 14:19:28 +01:00
Andras Slemmer
618f46cba4
node: Fix JsonSupportTest imports
2016-09-06 13:59:01 +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
9ff1ad7769
node: Fix redelivery race
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
9d83a9b6d2
Minor: move transaction types out of the contracts package and into a new transactions package
2016-09-06 14:20:32 +02: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
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
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
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
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
637a41401d
node-driver: Reuse address when polling for port, poll for correct condition\(!\)
2016-09-05 11:04:31 +01:00
Mike Hearn
3854fec17f
Testing: Make PortAllocation set SO_REUSEADDR to avoid CI conflicts
2016-09-05 11:22:00 +02:00
Andras Slemmer
ca1b0083ed
node: Clean up messy issue in test
2016-09-01 18:15:47 +01:00
Andras Slemmer
dded4c6e8f
node: FIx WalletMonitorService tests
2016-09-01 18:15:47 +01:00
Ross Nicoll
4d0b23ab6f
Add log4j-web to node
...
Add log4j-web to node so it stops complaining that it's running in a web environment without that option.
Longer term we may want to split the web parts into their own optional extra for node, but for now I think
this is a sensible solution.
2016-09-01 16:15:15 +01:00
Ross Nicoll
b913b18e02
Merged in rnicoll-simulations (pull request #314 )
...
Move test code from node to test-utils
2016-09-01 15:21:34 +01:00
Ross Nicoll
868b23a923
Move simulations to top level
2016-09-01 11:15:05 +01:00
Ross Nicoll
07f44e9e2a
Move test code from node to test-utils
2016-09-01 11:15:05 +01:00
Matthew Nesbit
039229cdfd
Remove bouncycastle-jdk14 that is causing problems for one of the member banks.
...
Only need testCompile scope
2016-09-01 11:04:48 +01:00
Andras Slemmer
86d6ee0110
node: Cash Issue doesn't require notary
2016-09-01 09:36:06 +01:00
Andras Slemmer
cfebccc495
node: Remove TransactionBuildResult.Complete, add pretty printing of ServiceToClientEvent
2016-09-01 09:36:06 +01:00
Ross Nicoll
232db9a1fd
Move test utilities into their own package
...
This moves a lot of the test support code into its own package which is only imported for tests,
so it's not shipped as a part of core Corda. The node currently depends on this support code to
compile, although future work could try to separate this out. This change highlights that parts
of production code is dependent on test elements (i.e. dummy keys), and makes it harder for
such accidental crosses to occur later.
An integration test category is also added as part of this work, to contribute towards COR-345.
2016-08-31 15:40:54 +01:00
Clinton Alexander
5439e0980f
Merged in clint-driver-debug-fix (pull request #308 )
...
Fixed driver debug mode.
2016-08-31 11:31:02 +01:00
Clinton Alexander
0c4a80453a
Used lists instead of strings for appending to JavaArgs in driver.
2016-08-30 14:01:54 +01:00
Matthew Nesbit
8756b49794
Add switchable HTTPS to Node web server
...
Explain change of cipher
Include extracted Dev Corda Root certificate so that it can be installed by HTTPS users.
2016-08-30 13:07:40 +01:00
Clinton Alexander
82b416cb88
Fixed driver debug mode.
2016-08-30 12:03:31 +01:00
Ross Nicoll
ad8ffca0b4
Add CommitTransactionProtocol
...
Add new protocol which manages the entire process of taking a signed transaction ready
for notarisation, through notarisation and onto recording it both locally and informing
remote nodes.
This protocol also optionally can include the ClientToServiceCommand which triggered a transaction
being created, to give the remote nodes context on why a change occurred (i.e. "You are being sent
£100")
2016-08-25 16:30:39 +01:00
Matthew Nesbit
089ba2cb69
Only NetworkMapServer addresses can be publicly manufactured. Use identity publick key as addressing, with only bridges using the HostAndPort information
...
Fixup after rebase and fix issue with checking previous deployment of bridges
Correct comments on ArtemisMessagingClient constructor
Fixup rates fix demo
Get rid of when statements
Make NetworkMapCache send modify as well as add//remove events. Make inboxes for nodes persistent.
Suppress warnings
Fix message acknowledgement so that it actually consumes messages properly.
Change queueName to SimpleString to stop lots of wasted conversions
Get rid of spurious import
Tidy up and add comments
Update to include comments on PR
Remove unnecessary import
2016-08-25 15:56:50 +01:00
Ross Nicoll
f9880a4990
Pre-filter states passed to generateSpend()
...
Pre-filter states passed to generateSpend(), so that requests from the UI to spend cash only ever
spend cash with the correct issuer.
2016-08-25 13:20:12 +01:00
Mike Hearn
c8323099bb
Minor: cleanup the commercial paper contracts.
...
There's no need for the notary to be specified in commands. A few other tweaks and additions found whilst refreshing the docsite.
2016-08-25 11:30:25 +02:00
Mike Hearn
3e330a2d36
Merged in mike-fix-walletfiller (pull request #277 )
...
Rewrite the test wallet filler code to not be buggy.
2016-08-23 17:59:19 +02:00
Ross Nicoll
dc2f4055fc
Restrict cash exit commands to working on cash held by the issuer
...
Remove the ability to exit cash not held by the cash issuer; this solves a number of problems:
* Ensuring owner of the cash is aware of the funds being destroyed
* Determining where to send any change resulting from partial exiting of funds
* Auditing the destruction of funds
2016-08-22 17:17:19 +01:00
Clinton Alexander
668fecfea7
Merged in clint-no-notary-error (pull request #283 )
...
Fixed bug when incorrect notary service type is specified.
2016-08-22 16:41:38 +01:00
Mike Hearn
097bb033c4
Rewrite the test wallet filler code to not be buggy.
2016-08-22 16:26:32 +02:00
