Skip to content

Branch for merge to master#25

Open
rogersanick wants to merge 84 commits into
masterfrom
branchForMergeToMaster
Open

Branch for merge to master#25
rogersanick wants to merge 84 commits into
masterfrom
branchForMergeToMaster

Conversation

@rogersanick

Copy link
Copy Markdown
Contributor

No description provided.

RogerWillis and others added 30 commits April 13, 2017 18:40
Added comment about quasar instrumentation error when running flow tests and how to resolve it
* Fixes typos.

* Further typos.

* Simplifies and clarifies check for amount > 0.

* Adds imports required by solutions.

* Expands test to ensure amount and paid fields have matching tokens.

* Comments out test.

* Adds a withNewLender() test.

* Fixes indentation on flow tests.

* Adds run configs for the flow tests.
* Rebase to M14.

* Fixes bug in cash issuance.

* Fixes API.
Sphar-io and others added 23 commits August 14, 2018 15:57
Merge Corda training application template written in Java
Constraing -> Constraining
Fixing typos, improving documentation for IOUIssueFlowTests regarding quasar
Halfway through creating tests for IOUSettle contract tests

@amoothart amoothart left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

couple small tweaks, looks really good.

Make sure that the test hints match the java syntax

Comment thread README.md Outdated
Comment thread .idea/compiler.xml Outdated
<?xml version="1.0" encoding="UTF-8"?>
<project version="1">
<project version="4">
<component name="CompilerConfiguration">

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As in the template be careful about checking in .idea files and use the .gitignore

Comment thread README.md Outdated
Comment thread README.md Outdated
Comment thread README.md
Comment thread java-source/src/main/java/net/corda/training/state/IOUState.java Outdated
Comment thread java-source/src/main/java/net/corda/training/state/IOUState.java Outdated
Comment thread java-source/src/main/java/net/corda/training/state/IOUState.java Outdated
Comment thread java-source/src/main/java/net/corda/training/state/IOUState.java
Comment thread .idea/compiler.xml
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you confirm that you can check out the project from scratch and load in intelliJ just fine? we have to protect the process for loading the training app onto a new computer as it is very expensive in many classes.

@amoothart

Copy link
Copy Markdown
Contributor

Can you fix the PR name to something more meaningful?

The commits here show everything from the whole history, this should be limited to the changes you made.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants