Skip to content

Commit 3f931c8

Browse files
davidawaddavidawad
committed
cleaning up the code, contracts, tests, updating gradle wrapper version, autoformatting
1 parent f538423 commit 3f931c8

File tree

14 files changed

+60
-76
lines changed

14 files changed

+60
-76
lines changed

‎Features/dockerform-yocordapp/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Welcome to the Corda interactive shell.
5050
You can see the available commands by typing 'help'.
5151

5252
# you'll see the corda shell available and can run flows
53-
Fri May 15 18:23:03 GMT 2020>>> flow start YoFlow target: PartyB
53+
Fri May 15 18:23:03 GMT 2020>>> flow start YoFlow target: PartyA
5454

5555
✓ Starting
5656
✓ Creating a new Yo!

‎Features/dockerform-yocordapp/build.gradle‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44

55
ext {
66
corda_release_group = constants.getProperty("cordaReleaseGroup")
7-
corda_core_release_group = constants.getProperty("cordaCoreReleaseGroup")
7+
corda_core_release_group = constants.getProperty("cordaCoreReleaseGroup")
88
corda_release_version = constants.getProperty("cordaVersion")
99
corda_core_release_version = constants.getProperty("cordaCoreVersion")
1010
corda_gradle_plugins_version = constants.getProperty("gradlePluginsVersion")
@@ -73,8 +73,8 @@ dependencies {
7373
cordaRuntime "$corda_release_group:corda:$corda_release_version"
7474

7575
// CorDapp dependencies.
76-
cordapp project(":workflows")
77-
cordapp project(":contracts")
76+
cordapp project("contracts")
77+
cordapp project("workflows")
7878

7979
cordaCompile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
8080
cordaCompile "org.apache.logging.log4j:log4j-web:${log4j_version}"
@@ -83,7 +83,7 @@ dependencies {
8383

8484
cordapp {
8585
info {
86-
name "CorDapp yo"
86+
name "DockerForm Yo Cordapp"
8787
vendor "Corda Open Source"
8888
targetPlatformVersion corda_platform_version
8989
minimumPlatformVersion corda_platform_version
@@ -99,12 +99,12 @@ task deployNodesJava(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
9999
}
100100
cordapp project("contracts")
101101
cordapp project("workflows")
102-
rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
102+
rpcUsers = [[user: "user1", "password": "test", "permissions": ["ALL"]]]
103103
}
104104

105105
node {
106106
name "O=Notary,L=London,C=GB"
107-
notary = [validating : false]
107+
notary = [validating: false]
108108
p2pPort 10001
109109
p2pAddress "0.0.0.0"
110110
rpcSettings {
@@ -135,26 +135,25 @@ task deployNodesJava(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
135135
}
136136
sshdPort 2223
137137
}
138-
139138
}
140139

141140

142141
task prepareDockerNodes(type: net.corda.plugins.Dockerform, dependsOn: ['jar']) {
143142

144-
dockerImage="corda/corda-zulu-java1.8-"+corda_release_version+":latest"
143+
dockerImage = "corda/corda-zulu-java1.8-" + corda_release_version + ":latest"
145144

146145
nodeDefaults {
147146
projectCordapp {
148147
deploy = false
149148
}
150149
cordapp project("contracts")
151150
cordapp project("workflows")
152-
rpcUsers = [[ user: "user1", "password": "test", "permissions": ["ALL"]]]
151+
rpcUsers = [[user: "user1", "password": "test", "permissions": ["ALL"]]]
153152
}
154153

155154
node {
156155
name "O=Notary,L=London,C=GB"
157-
notary = [validating : false]
156+
notary = [validating: false]
158157
p2pPort 10001
159158
p2pAddress "0.0.0.0"
160159
rpcSettings {

‎Features/dockerform-yocordapp/constants.properties‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎Features/dockerform-yocordapp/contracts/build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cordapp {
44
targetPlatformVersion corda_platform_version
55
minimumPlatformVersion corda_platform_version
66
contract {
7-
name "yo CorDapp"
7+
name "DockerForm Yo Cordapp"
88
vendor "Corda Open Source"
99
licence "Apache License, Version 2.0"
1010
versionId 1
@@ -14,6 +14,5 @@ cordapp {
1414
dependencies {
1515
// Corda dependencies.
1616
cordaCompile "$corda_release_group:corda-core:$corda_release_version"
17-
1817
testCompile "$corda_release_group:corda-node-driver:$corda_release_version"
19-
}
18+
}

Features/dockerform-yocordapp/contracts/src/main/java/net/corda/examples/yo/contracts/YoContract.java renamed to Features/dockerform-yocordapp/contracts/src/main/java/net/corda/samples/dockerform/contracts/YoContract.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
package net.corda.examples.yo.contracts;
1+
package net.corda.samples.dockerform.contracts;
22

33
import net.corda.core.contracts.CommandData;
44
import net.corda.core.contracts.CommandWithParties;
55
import net.corda.core.contracts.Contract;
66
import net.corda.core.transactions.LedgerTransaction;
7-
import net.corda.examples.yo.states.YoState;
7+
import net.corda.samples.dockerform.states.YoState;
88
import org.jetbrains.annotations.NotNull;
99

10-
import static net.corda.core.contracts.ContractsDSL.*;
10+
import static net.corda.core.contracts.ContractsDSL.requireSingleCommand;
11+
import static net.corda.core.contracts.ContractsDSL.requireThat;
1112

1213
// ************
1314
// * Contract *
1415
// ************
1516
// Contract and state.
1617
public class YoContract implements Contract {
1718
// Used to identify our contract when building a transaction.
18-
public static final String ID = "net.corda.examples.yo.contracts.YoContract";
19+
public static final String ID = "net.corda.samples.dockerform.contracts.YoContract";
1920

2021
// Contract code.
2122
@Override
@@ -35,6 +36,7 @@ public void verify(@NotNull LedgerTransaction tx) throws IllegalArgumentExceptio
3536

3637
// Used to indicate the transaction's intent.
3738
public interface Commands extends CommandData {
38-
class Send implements Commands {}
39+
class Send implements Commands {
40+
}
3941
}
4042
}

Features/dockerform-yocordapp/contracts/src/main/java/net/corda/examples/yo/states/YoState.java renamed to Features/dockerform-yocordapp/contracts/src/main/java/net/corda/samples/dockerform/states/YoState.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
package net.corda.examples.yo.states;
1+
package net.corda.samples.dockerform.states;
22

33
import net.corda.core.contracts.BelongsToContract;
44
import net.corda.core.contracts.ContractState;
55
import net.corda.core.identity.AbstractParty;
66
import net.corda.core.identity.Party;
77
import net.corda.core.serialization.ConstructorForDeserialization;
8-
import net.corda.core.serialization.CordaSerializable;
9-
import net.corda.examples.yo.contracts.YoContract;
8+
import net.corda.samples.dockerform.contracts.YoContract;
109
import org.jetbrains.annotations.NotNull;
1110

12-
import java.util.Arrays;
11+
import java.util.Collections;
1312
import java.util.List;
1413

1514
// *********
@@ -35,25 +34,25 @@ public YoState(Party origin, Party target) {
3534
}
3635

3736
public Party getOrigin() {
38-
return origin;
37+
return this.origin;
3938
}
4039

4140
public Party getTarget() {
42-
return target;
41+
return this.target;
4342
}
4443

4544
public String getYo() {
46-
return yo;
45+
return this.yo;
4746
}
4847

4948
@NotNull
5049
@Override
5150
public List<AbstractParty> getParticipants() {
52-
return Arrays.asList(target);
51+
return Collections.singletonList(this.target);
5352
}
5453

5554
@Override
5655
public String toString() {
57-
return origin.getName() + ": " + yo;
56+
return this.origin.getName() + ": " + this.yo;
5857
}
5958
}

‎Features/dockerform-yocordapp/gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
name=Test
2-
group=net.corda.examples.yo
1+
name=DockerForm Yo Cordapp
2+
group=net.corda.samples.dockerform
33
version=0.1

‎Features/dockerform-yocordapp/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

‎Features/dockerform-yocordapp/workflows/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cordapp {
55
targetPlatformVersion corda_platform_version
66
minimumPlatformVersion corda_platform_version
77
workflow {
8-
name "yo Flows"
8+
name "DockerForm Yo Cordapp"
99
vendor "Corda Open Source"
1010
licence "Apache License, Version 2.0"
1111
versionId 1
@@ -18,6 +18,7 @@ sourceSets {
1818
srcDir rootProject.file("config/dev")
1919
}
2020
}
21+
2122
test {
2223
resources {
2324
srcDir rootProject.file("config/test")

Features/dockerform-yocordapp/workflows/src/integrationTest/java/net/corda/examples/yo/DriverBasedTest.java renamed to Features/dockerform-yocordapp/workflows/src/integrationTest/java/net/corda/samples/dockerform/DriverBasedTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.corda.examples.yo;
1+
package net.corda.samples.dockerform;
22

33
import net.corda.core.identity.CordaX500Name;
44
import net.corda.testing.core.TestIdentity;

0 commit comments

Comments
 (0)