refactor(timekeeper): completely isolate timekeeper classes into the …

…timekeeper pkg Signed-off-by: Kevin O'Donnell <[email protected]>
blockchaintp · Jun 3, 2021 · d408a28 · d408a28
1 parent d942361
commit d408a28
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 19 deletions.
diff --git a/sawtooth-daml-common/src/main/java/com/blockchaintp/sawtooth/timekeeper/package-info.java b/sawtooth-daml-common/src/main/java/com/blockchaintp/sawtooth/timekeeper/package-info.java
diff --git a/sawtooth-daml-common/src/test/com/blockchaintp/sawtooth/daml/NamespaceTest.java b/sawtooth-daml-common/src/test/com/blockchaintp/sawtooth/daml/NamespaceTest.java
@@ -15,13 +15,11 @@
 
 import org.junit.Test;
 
-import com.blockchaintp.sawtooth.timekeeper.Namespace;
-
 public class NamespaceTest {
 
   @Test
   public void testMakeAddress() {
-    String testString = Namespace.makeAddress(Namespace.getNameSpace(), "somerandomString");
+    var testString = Namespace.makeAddress(Namespace.getNameSpace(), "somerandomString");
     assertTrue(testString.length() == 70);
   }
 

diff --git a/sawtooth-daml-rpc/pom.xml b/sawtooth-daml-rpc/pom.xml
@@ -219,6 +219,11 @@
       <artifactId>daml-on-sawtooth-protobufs</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
+    <dependency>
+      <groupId>daml-on-sawtooth</groupId>
+      <artifactId>timekeeper</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.hyperledger.sawtooth</groupId>
       <artifactId>sawtooth-sdk-transaction-processor</artifactId>

diff --git a/sawtooth-daml-tp/pom.xml b/sawtooth-daml-tp/pom.xml
@@ -121,6 +121,11 @@
       <artifactId>sawtooth-daml-common</artifactId>
       <version>${project.parent.version}</version>
     </dependency>
+    <dependency>
+      <groupId>daml-on-sawtooth</groupId>
+      <artifactId>timekeeper</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
     <dependency>
       <groupId>daml-on-sawtooth</groupId>
       <artifactId>daml-on-sawtooth-protobufs</artifactId>

diff --git a/...p/sawtooth/timekeeper/EventConstants.java → ...p/sawtooth/timekeeper/EventConstants.java b/...p/sawtooth/timekeeper/EventConstants.java → ...p/sawtooth/timekeeper/EventConstants.java
diff --git a/...haintp/sawtooth/timekeeper/Namespace.java → ...haintp/sawtooth/timekeeper/Namespace.java b/...haintp/sawtooth/timekeeper/Namespace.java → ...haintp/sawtooth/timekeeper/Namespace.java