modify snakeandladder package name

peterli-r3 · peterli-r3 · commit c011e9f11fd7 · 2020-12-20T16:05:10.000-05:00
diff --git a/Advanced/snakesandladders-cordapp/build.gradle b/Advanced/snakesandladders-cordapp/build.gradle
@@ -49,9 +49,11 @@ allprojects {
         jcenter()
         mavenCentral()
         maven { url 'https://software.r3.com/artifactory/corda' }
+        maven { url 'https://jitpack.io' }
+        //SDK lib
         maven { url 'https://software.r3.com/artifactory/corda-lib' }
-        maven { url 'https://software.r3.com/artifactory/corda-lib-dev' }
-        maven { url "https://repo.gradle.org/gradle/libs-releases-local" }
+        //Gradle Plugins
+        maven { url 'https://repo.gradle.org/gradle/libs-releases' }
     }
 
     tasks.withType(JavaCompile) {
@@ -103,29 +105,6 @@ dependencies {
     cordapp "$accounts_release_group:accounts-workflows:$accounts_release_version"
 }
 
-cordapp {
-    info {
-        name "CorDapp Snakes And Ladders"
-        vendor "Corda Open Source"
-        targetPlatformVersion corda_platform_version
-        minimumPlatformVersion corda_platform_version
-    }
-}
-
-task ganache {
-    subprojects {
-        if (it.project.name != "clients") {
-            dependsOn jar
-            doLast {
-                copy {
-                    from "${buildDir}/libs"
-                    into "${rootDir}/build/libs"
-                }
-            }
-        }
-    }
-}
-
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     nodeDefaults {
         projectCordapp {
@@ -182,6 +161,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         cordapp project(":oracle-flows")
     }
 }
+
 task installQuasar(type: Copy) {
     destinationDir rootProject.file("lib")
     from(configurations.quasar) {
diff --git a/Advanced/snakesandladders-cordapp/contracts/src/main/java/net/corda/samples/snl/contracts/BoardConfigContract.java b/Advanced/snakesandladders-cordapp/contracts/src/main/java/net/corda/samples/snl/contracts/BoardConfigContract.java
@@ -1,13 +1,13 @@
-package net.corda.sample.snl.contracts;
+package net.corda.samples.snl.contracts;
 
 import net.corda.core.contracts.CommandData;
 import net.corda.core.contracts.Contract;
 import net.corda.core.transactions.LedgerTransaction;
-import net.corda.sample.snl.states.BoardConfig;
+import net.corda.samples.snl.states.BoardConfig;
 import org.jetbrains.annotations.NotNull;
 
 public class BoardConfigContract implements Contract {
-    public static String ID = "net.corda.sample.snl.contracts.BoardConfigContract";
+    public static String ID = "BoardConfigContract";
 
     @Override
     public void verify(@NotNull LedgerTransaction tx) throws IllegalArgumentException {
diff --git a/Advanced/snakesandladders-cordapp/contracts/src/main/java/net/corda/samples/snl/contracts/GameBoardContract.java b/Advanced/snakesandladders-cordapp/contracts/src/main/java/net/corda/samples/snl/contracts/GameBoardContract.java
@@ -1,10 +1,10 @@
-package net.corda.sample.snl.contracts;
+package net.corda.samples.snl.contracts;
 
 import net.corda.core.contracts.CommandData;
 import net.corda.core.contracts.Contract;
 import net.corda.core.transactions.LedgerTransaction;
-import net.corda.sample.snl.states.BoardConfig;
-import net.corda.sample.snl.states.GameBoard;
+import net.corda.samples.snl.states.BoardConfig;
+import net.corda.samples.snl.states.GameBoard;
 import org.jetbrains.annotations.NotNull;
 
 public class GameBoardContract implements Contract {
diff --git a/Advanced/snakesandladders-cordapp/contracts/src/main/java/net/corda/samples/snl/states/BoardConfig.java b/Advanced/snakesandladders-cordapp/contracts/src/main/java/net/corda/samples/snl/states/BoardConfig.java
@@ -1,10 +1,9 @@
-package net.corda.sample.snl.states;
+package net.corda.samples.snl.states;
 
 import net.corda.core.contracts.BelongsToContract;
 import net.corda.core.contracts.ContractState;
 import net.corda.core.identity.AbstractParty;
-import net.corda.sample.snl.contracts.BoardConfigContract;
-import net.corda.sample.snl.contracts.GameBoardContract;
+import net.corda.samples.snl.contracts.BoardConfigContract;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
diff --git a/Advanced/snakesandladders-cordapp/contracts/src/main/java/net/corda/samples/snl/states/GameBoard.java b/Advanced/snakesandladders-cordapp/contracts/src/main/java/net/corda/samples/snl/states/GameBoard.java
@@ -1,10 +1,10 @@
-package net.corda.sample.snl.states;
+package net.corda.samples.snl.states;
 
 import net.corda.core.contracts.BelongsToContract;
 import net.corda.core.contracts.LinearState;
 import net.corda.core.contracts.UniqueIdentifier;
 import net.corda.core.identity.AbstractParty;
-import net.corda.sample.snl.contracts.GameBoardContract;
+import net.corda.samples.snl.contracts.GameBoardContract;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
diff --git a/Advanced/snakesandladders-cordapp/contracts/src/test/java/net/corda/samples/snl/contracts/ContractTests.java b/Advanced/snakesandladders-cordapp/contracts/src/test/java/net/corda/samples/snl/contracts/ContractTests.java
@@ -1,16 +1,14 @@
-package net.corda.sample.snl.contracts;
+package net.corda.samples.snl.contracts;
 
 import net.corda.core.identity.CordaX500Name;
-import net.corda.sample.snl.contracts.BoardConfigContract;
-import net.corda.sample.snl.states.BoardConfig;
+import net.corda.samples.snl.states.BoardConfig;
 import net.corda.testing.core.TestIdentity;
 import net.corda.testing.node.MockServices;
 import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
-import java.util.Map;
 
 import static net.corda.testing.node.NodeTestUtils.transaction;
 
diff --git a/Advanced/snakesandladders-cordapp/contracts/src/test/java/net/corda/samples/snl/contracts/StateTests.java b/Advanced/snakesandladders-cordapp/contracts/src/test/java/net/corda/samples/snl/contracts/StateTests.java
@@ -1,12 +1,10 @@
-package net.corda.sample.snl.contracts;
+package net.corda.samples.snl.contracts;
 
 import net.corda.core.contracts.UniqueIdentifier;
-import net.corda.sample.snl.states.GameBoard;
+import net.corda.samples.snl.states.GameBoard;
 import net.corda.testing.node.MockServices;
 import org.junit.Test;
 
-import java.util.UUID;
-
 public class StateTests {
     private final MockServices ledgerServices = new MockServices();
 
diff --git a/Advanced/snakesandladders-cordapp/gradle/wrapper/gradle-wrapper.properties b/Advanced/snakesandladders-cordapp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateBoardConfig.java b/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateBoardConfig.java
@@ -13,7 +13,7 @@
 import net.corda.core.identity.Party;
 import net.corda.core.transactions.SignedTransaction;
 import net.corda.core.transactions.TransactionBuilder;
-import net.corda.sample.snl.states.BoardConfig;
+import net.corda.samples.snl.states.BoardConfig;
 
 import java.security.SignatureException;
 import java.util.*;
diff --git a/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateGameFlow.java b/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/CreateGameFlow.java
@@ -15,8 +15,8 @@
 import net.corda.core.identity.Party;
 import net.corda.core.transactions.SignedTransaction;
 import net.corda.core.transactions.TransactionBuilder;
-import net.corda.sample.snl.states.BoardConfig;
-import net.corda.sample.snl.states.GameBoard;
+import net.corda.samples.snl.states.BoardConfig;
+import net.corda.samples.snl.states.GameBoard;
 
 import java.security.SignatureException;
 import java.util.Arrays;
diff --git a/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/PlayerMoveFlow.java b/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/PlayerMoveFlow.java
@@ -19,9 +19,9 @@
 import net.corda.core.transactions.FilteredTransaction;
 import net.corda.core.transactions.SignedTransaction;
 import net.corda.core.transactions.TransactionBuilder;
-import net.corda.sample.snl.contracts.GameBoardContract;
-import net.corda.sample.snl.states.BoardConfig;
-import net.corda.sample.snl.states.GameBoard;
+import net.corda.samples.snl.contracts.GameBoardContract;
+import net.corda.samples.snl.states.BoardConfig;
+import net.corda.samples.snl.states.GameBoard;
 import net.corda.samples.snl.oracle.flows.OracleSignatureFlow;
 
 import java.security.SignatureException;
@@ -152,11 +152,8 @@ else if(boardConfig.getSnakePositions().keySet().contains(newPlayer2Pos))
                     .getNodeByLegalName(CordaX500Name.parse("O=Oracle,L=Mumbai,C=IN")).getLegalIdentities().get(0);
 
             FilteredTransaction ftx = selfSignedTransaction.buildFilteredTransaction(o -> {
-                if (o instanceof Command && ((Command) o).getSigners().contains(oracle.getOwningKey())
-                        && ((Command) o).getValue() instanceof GameBoardContract.Commands.PlayMove) {
-                    return  true;
-                }
-                return false;
+                return o instanceof Command && ((Command) o).getSigners().contains(oracle.getOwningKey())
+                        && ((Command) o).getValue() instanceof GameBoardContract.Commands.PlayMove;
             });
 
             TransactionSignature oracleSignature = subFlow(new OracleSignatureFlow(oracle, ftx));
diff --git a/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/QueyGameInfo.java b/Advanced/snakesandladders-cordapp/workflows/src/main/java/net/corda/samples/snl/flows/QueyGameInfo.java
@@ -10,7 +10,7 @@
 import net.corda.core.flows.StartableByRPC;
 import net.corda.core.node.services.Vault;
 import net.corda.core.node.services.vault.QueryCriteria;
-import net.corda.sample.snl.states.GameBoard;
+import net.corda.samples.snl.states.GameBoard;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/Advanced/snakesandladders-cordapp/workflows/src/test/java/net/corda/samples/snl/flows/FlowTests.java b/Advanced/snakesandladders-cordapp/workflows/src/test/java/net/corda/samples/snl/flows/FlowTests.java
@@ -1,16 +1,11 @@
 package net.corda.samples.snl.flows;
 
 import com.google.common.collect.ImmutableList;
-import com.r3.corda.lib.accounts.contracts.states.AccountInfo;
 import com.r3.corda.lib.accounts.workflows.flows.CreateAccount;
 import net.corda.core.concurrent.CordaFuture;
 import net.corda.core.node.NetworkParameters;
 import net.corda.core.transactions.SignedTransaction;
-import net.corda.sample.snl.states.BoardConfig;
-import net.corda.samples.snl.flows.CreateAndShareAccountFlow;
-import net.corda.samples.snl.flows.CreateBoardConfig;
-import net.corda.samples.snl.flows.CreateGameFlow;
-import net.corda.samples.snl.flows.GameInfo;
+import net.corda.samples.snl.states.BoardConfig;
 import net.corda.testing.node.MockNetwork;
 import net.corda.testing.node.MockNetworkParameters;
 import net.corda.testing.node.StartedMockNode;
@@ -35,7 +30,7 @@ public void setup() {
                 new MockNetworkParameters(
                         ImmutableList.of(
                                 TestCordapp.findCordapp("net.corda.samples.snl.flows"),
-                                TestCordapp.findCordapp("net.corda.sample.snl.contracts"),
+                                TestCordapp.findCordapp("net.corda.samples.snl.contracts"),
                                 TestCordapp.findCordapp("com.r3.corda.lib.accounts.contracts"),
                                 TestCordapp.findCordapp("com.r3.corda.lib.accounts.workflows"),
                                 TestCordapp.findCordapp("com.r3.corda.lib.ci"))
