Skip to content

Commit 7cfd4ea

Browse files
davidawaddavidawad
committed
upload
1 parent 47408bf commit 7cfd4ea

File tree

18 files changed

+60
-45
lines changed

18 files changed

+60
-45
lines changed

‎Advanced/negotiation-cordapp/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ First, go the the shell of PartyA, and propose a deal with yourself as buyer and
5252

5353
We can now look at the proposals in the PartyA's vault:
5454

55-
run vaultQuery contractStateType: negotiation.states.ProposalState
55+
run vaultQuery contractStateType: ProposalState
5656

5757
If we note down the state's `linearId.id`, we can now modify the proposal from the shell of PartyB by running:
5858

@@ -65,4 +65,4 @@ Finally, let's have PartyA accept the proposal:
6565
We can now see the accepted trade in our vault with the new value by running the command (note we are now querying for
6666
`TradeState`s, not `ProposalState`s):
6767

68-
run vaultQuery contractStateType: negotiation.states.TradeState
68+
run vaultQuery contractStateType: TradeState

‎Advanced/negotiation-cordapp/build.gradle‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ buildscript {
33
file("$projectDir/../constants.properties").withInputStream { constants.load(it) }
44

55
ext {
6-
76
corda_release_group = constants.getProperty("cordaReleaseGroup")
87
corda_core_release_group = constants.getProperty("cordaCoreReleaseGroup")
98
corda_release_version = constants.getProperty("cordaVersion")
@@ -21,12 +20,15 @@ buildscript {
2120
}
2221

2322
repositories {
23+
jcenter()
2424
mavenLocal()
2525
mavenCentral()
26-
jcenter()
27-
maven { url 'http://software.r3.com/artifactory/corda-lib-dev' }
28-
maven { url 'http://software.r3.com/artifactory/corda-lib' }
26+
2927
maven { url 'https://software.r3.com/artifactory/corda' }
28+
maven { url 'http://software.r3.com/artifactory/corda-lib' }
29+
maven { url 'http://software.r3.com/artifactory/corda-lib-dev' }
30+
maven { url 'https://software.r3.com/artifactory/corda-releases' }
31+
3032
// Corda dependencies for the patched Quasar version
3133
maven { url "https://software.r3.com/artifactory/corda-dependencies" } // access to the patched Quasar version
3234
}
@@ -36,7 +38,6 @@ buildscript {
3638
classpath "net.corda.plugins:cordformation:$corda_gradle_plugins_version"
3739
classpath "net.corda.plugins:quasar-utils:$corda_gradle_plugins_version"
3840
classpath "org.springframework.boot:spring-boot-gradle-plugin:$spring_boot_gradle_plugin_version"
39-
4041
}
4142
}
4243

@@ -155,3 +156,9 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
155156
}
156157
}
157158

159+
task installQuasar(type: Copy) {
160+
destinationDir rootProject.file("lib")
161+
from(configurations.quasar) {
162+
rename 'quasar-core(.*).jar', 'quasar.jar'
163+
}
164+
}

‎Advanced/negotiation-cordapp/contracts/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'java'
22
apply plugin: 'net.corda.plugins.cordapp'
33

4-
jar.baseName = "timesheet-timesheet-contracts"
4+
//jar.baseName = "timesheet-timesheet-contracts" TODO remove this
55

66
cordapp {
77
targetPlatformVersion corda_platform_version.toInteger()
@@ -29,4 +29,4 @@ dependencies {
2929

3030
tasks.withType(JavaCompile) {
3131
options.compilerArgs << "-parameters" // Required for shell commands.
32-
}
32+
}

Advanced/negotiation-cordapp/contracts/src/main/java/negotiation/contracts/ProposalAndTradeContract.java renamed to Advanced/negotiation-cordapp/contracts/src/main/java/net/corda/samples/negotiation/contracts/ProposalAndTradeContract.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
package negotiation.contracts;
1+
package net.corda.samples.negotiation.contracts;
22

33
import com.google.common.collect.ImmutableSet;
4-
import negotiation.states.ProposalState;
5-
import negotiation.states.TradeState;
4+
import net.corda.samples.negotiation.states.ProposalState;
5+
import net.corda.samples.negotiation.states.TradeState;
66
import net.corda.core.contracts.CommandData;
77
import net.corda.core.contracts.CommandWithParties;
88
import net.corda.core.contracts.Contract;
99
import net.corda.core.transactions.LedgerTransaction;
10+
1011
import static net.corda.core.contracts.ContractsDSL.requireThat;
1112

1213
public class ProposalAndTradeContract implements Contract {
13-
public static String ID = "negotiation.contracts.ProposalAndTradeContract";
14+
public static String ID = "ProposalAndTradeContract";
1415
@Override
1516
public void verify(LedgerTransaction tx) throws IllegalArgumentException {
1617
final CommandWithParties command = tx.getCommands().get(0);

Advanced/negotiation-cordapp/contracts/src/main/java/negotiation/states/ProposalState.java renamed to Advanced/negotiation-cordapp/contracts/src/main/java/net/corda/samples/negotiation/states/ProposalState.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
package negotiation.states;
1+
package net.corda.samples.negotiation.states;
22

33
import com.google.common.collect.ImmutableList;
4-
import negotiation.contracts.ProposalAndTradeContract;
4+
import net.corda.samples.negotiation.contracts.ProposalAndTradeContract;
55
import net.corda.core.contracts.BelongsToContract;
6-
import net.corda.core.contracts.ContractState;
76
import net.corda.core.contracts.LinearState;
87
import net.corda.core.contracts.UniqueIdentifier;
98
import net.corda.core.identity.AbstractParty;

Advanced/negotiation-cordapp/contracts/src/main/java/negotiation/states/TradeState.java renamed to Advanced/negotiation-cordapp/contracts/src/main/java/net/corda/samples/negotiation/states/TradeState.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package negotiation.states;
1+
package net.corda.samples.negotiation.states;
22

33
import com.google.common.collect.ImmutableList;
4-
import negotiation.contracts.ProposalAndTradeContract;
4+
import net.corda.samples.negotiation.contracts.ProposalAndTradeContract;
55
import net.corda.core.contracts.BelongsToContract;
66
import net.corda.core.contracts.LinearState;
77
import net.corda.core.contracts.UniqueIdentifier;

Advanced/negotiation-cordapp/contracts/src/test/java/negotiation/contracts/AcceptanceContractTests.java renamed to Advanced/negotiation-cordapp/contracts/src/test/java/net/corda/samples/negotiation/contracts/AcceptanceContractTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package negotiation.contracts;
1+
package net.corda.samples.negotiation.contracts;
22

33
import com.google.common.collect.ImmutableList;
4-
import negotiation.states.ProposalState;
5-
import negotiation.states.TradeState;
4+
import net.corda.samples.negotiation.states.ProposalState;
5+
import net.corda.samples.negotiation.states.TradeState;
66
import net.corda.testing.core.DummyCommandData;
77
import net.corda.testing.core.TestIdentity;
88
import net.corda.testing.node.MockServices;

Advanced/negotiation-cordapp/contracts/src/test/java/negotiation/contracts/ModificationContractTests.java renamed to Advanced/negotiation-cordapp/contracts/src/test/java/net/corda/samples/negotiation/contracts/ModificationContractTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package negotiation.contracts;
1+
package net.corda.samples.negotiation.contracts;
22

33
import com.google.common.collect.ImmutableList;
4-
import negotiation.states.ProposalState;
5-
import negotiation.states.TradeState;
4+
import net.corda.samples.negotiation.states.ProposalState;
5+
import net.corda.samples.negotiation.states.TradeState;
66
import net.corda.testing.core.DummyCommandData;
77
import net.corda.testing.core.TestIdentity;
88
import net.corda.testing.node.MockServices;
@@ -13,6 +13,7 @@
1313
import static net.corda.testing.node.NodeTestUtils.ledger;
1414

1515
public class ModificationContractTests {
16+
1617
private MockServices ledgerServices = new MockServices(ImmutableList.of("negotiation.contracts"));
1718
private TestIdentity alice = new TestIdentity(new net.corda.core.identity.CordaX500Name("alice","New York", "US"));
1819
private TestIdentity bob = new TestIdentity(new net.corda.core.identity.CordaX500Name("bob","Tokyo", "JP"));

Advanced/negotiation-cordapp/contracts/src/test/java/negotiation/contracts/ProposalContractTests.java renamed to Advanced/negotiation-cordapp/contracts/src/test/java/net/corda/samples/negotiation/contracts/ProposalContractTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package negotiation.contracts;
1+
package net.corda.samples.negotiation.contracts;
22

33
import com.google.common.collect.ImmutableList;
4-
import negotiation.states.ProposalState;
4+
import net.corda.samples.negotiation.states.ProposalState;
55
import net.corda.testing.contracts.DummyState;
66
import net.corda.testing.core.DummyCommandData;
77
import net.corda.testing.core.TestIdentity;

‎Advanced/negotiation-cordapp/contracts/src/test/java/net/corda/samples/negotiation/states/ProposalState.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package net.corda.samples.negotiation.states;
2+
3+
public class ProposalState {
4+
}

0 commit comments

Comments
 (0)