Upgrading Frequency

pfrank13 · pfrank13 · commit 97ec42c5e323 · 2025-01-07T12:36:39.000-08:00
Also updating testcontainers as it's not playing nice with the latest verswion of Docker Desktop (or more likely Docker itself)

As it was not playing nice with the Docker Desktop
diff --git a/api/build.gradle b/api/build.gradle
@@ -14,8 +14,8 @@ dependencies {
 
     testImplementation project(':tests')
 
-    testImplementation 'org.testcontainers:testcontainers:1.17.3'
-    testImplementation 'org.testcontainers:junit-jupiter:1.17.3'
+    testImplementation 'org.testcontainers:testcontainers:1.20.1'
+    testImplementation 'org.testcontainers:junit-jupiter:1.20.1'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.hamcrest:hamcrest:2.2'
 
diff --git a/pallet/build.gradle b/pallet/build.gradle
@@ -10,8 +10,8 @@ dependencies {
 
     testAnnotationProcessor project(':rpc:rpc-codegen')
 
-    testImplementation 'org.testcontainers:testcontainers:1.17.3'
-    testImplementation 'org.testcontainers:junit-jupiter:1.17.3'
+    testImplementation 'org.testcontainers:testcontainers:1.20.1'
+    testImplementation 'org.testcontainers:junit-jupiter:1.20.1'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.hamcrest:hamcrest:2.2'
 }
diff --git a/rpc/rpc-api/build.gradle b/rpc/rpc-api/build.gradle
@@ -12,8 +12,8 @@ dependencies {
 
     testAnnotationProcessor project(':scale:scale-codegen')
 
-    testImplementation 'org.testcontainers:testcontainers:1.17.3'
-    testImplementation 'org.testcontainers:junit-jupiter:1.17.3'
+    testImplementation 'org.testcontainers:testcontainers:1.20.1'
+    testImplementation 'org.testcontainers:junit-jupiter:1.20.1'
     testImplementation 'org.awaitility:awaitility:4.2.0'
     testImplementation 'org.hamcrest:hamcrest:2.2'
 }
diff --git a/rpc/rpc-api/src/test/java/com/strategyobject/substrateclient/rpc/api/SignedExtraTest.java b/rpc/rpc-api/src/test/java/com/strategyobject/substrateclient/rpc/api/SignedExtraTest.java
@@ -69,8 +69,8 @@ void testSignedExtra(boolean includeMetadataHash, String expectedHash) throws Ex
   @ParameterizedTest
   @CsvSource(
     {
-      "false,0x830000000100000077000000000000000000000000000000000000000000000000000000000000777700000000000000000000000000000000000000000000000000000000000077",
-      "true,0x83000000010000007700000000000000000000000000000000000000000000000000000000000077770000000000000000000000000000000000000000000000000000000000007700",
+      "false,0x8d0000000100000077000000000000000000000000000000000000000000000000000000000000777700000000000000000000000000000000000000000000000000000000000077",
+      "true,0x8d000000010000007700000000000000000000000000000000000000000000000000000000000077770000000000000000000000000000000000000000000000000000000000007700",
     }
   )
   void testSignedExtraAdditional(boolean includeMetadataHash, String expectedHash) throws Exception {
diff --git a/tests/build.gradle b/tests/build.gradle
@@ -1,4 +1,4 @@
 dependencies {
-    implementation 'org.testcontainers:testcontainers:1.17.3'
+    implementation 'org.testcontainers:testcontainers:1.20.1'
     implementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'
 }
diff --git a/tests/src/main/java/com/strategyobject/substrateclient/tests/containers/FrequencyVersion.java b/tests/src/main/java/com/strategyobject/substrateclient/tests/containers/FrequencyVersion.java
@@ -1,8 +1,8 @@
 package com.strategyobject.substrateclient.tests.containers;
 
 public class FrequencyVersion {
-    public static final String CURRENT_VERSION = "v1.15.0";
-    public static final Long SPEC = 131L;
+    public static final String CURRENT_VERSION = "v1.15.3";
+    public static final Long SPEC = 141L;
 
     private FrequencyVersion() {
     }
diff --git a/transport/build.gradle b/transport/build.gradle
@@ -7,8 +7,8 @@ dependencies {
 
     annotationProcessor project(':scale:scale-codegen')
     testImplementation project(':tests')
-    testImplementation 'org.testcontainers:testcontainers:1.17.3'
-    testImplementation 'org.testcontainers:junit-jupiter:1.17.3'
-    testImplementation 'org.testcontainers:toxiproxy:1.17.3'
+    testImplementation 'org.testcontainers:testcontainers:1.20.1'
+    testImplementation 'org.testcontainers:junit-jupiter:1.20.1'
+    testImplementation 'org.testcontainers:toxiproxy:1.20.1'
     testImplementation 'org.awaitility:awaitility:4.2.0'
 }

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ dependencies {`
`10`	`10`
`11`	`11`	`testAnnotationProcessor project(':rpc:rpc-codegen')`
`12`	`12`
`13`		`- testImplementation 'org.testcontainers:testcontainers:1.17.3'`
`14`		`- testImplementation 'org.testcontainers:junit-jupiter:1.17.3'`
	`13`	`+ testImplementation 'org.testcontainers:testcontainers:1.20.1'`
	`14`	`+ testImplementation 'org.testcontainers:junit-jupiter:1.20.1'`
`15`	`15`	`testImplementation 'org.awaitility:awaitility:4.2.0'`
`16`	`16`	`testImplementation 'org.hamcrest:hamcrest:2.2'`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ dependencies {`
`12`	`12`
`13`	`13`	`testAnnotationProcessor project(':scale:scale-codegen')`
`14`	`14`
`15`		`- testImplementation 'org.testcontainers:testcontainers:1.17.3'`
`16`		`- testImplementation 'org.testcontainers:junit-jupiter:1.17.3'`
	`15`	`+ testImplementation 'org.testcontainers:testcontainers:1.20.1'`
	`16`	`+ testImplementation 'org.testcontainers:junit-jupiter:1.20.1'`
`17`	`17`	`testImplementation 'org.awaitility:awaitility:4.2.0'`
`18`	`18`	`testImplementation 'org.hamcrest:hamcrest:2.2'`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ void testSignedExtra(boolean includeMetadataHash, String expectedHash) throws Ex`
`69`	`69`	`@ParameterizedTest`
`70`	`70`	`@CsvSource(`
`71`	`71`	`{`
`72`		`- "false,0x830000000100000077000000000000000000000000000000000000000000000000000000000000777700000000000000000000000000000000000000000000000000000000000077",`
`73`		`- "true,0x83000000010000007700000000000000000000000000000000000000000000000000000000000077770000000000000000000000000000000000000000000000000000000000007700",`
	`72`	`+ "false,0x8d0000000100000077000000000000000000000000000000000000000000000000000000000000777700000000000000000000000000000000000000000000000000000000000077",`
	`73`	`+ "true,0x8d000000010000007700000000000000000000000000000000000000000000000000000000000077770000000000000000000000000000000000000000000000000000000000007700",`
`74`	`74`	`}`
`75`	`75`	`)`
`76`	`76`	`void testSignedExtraAdditional(boolean includeMetadataHash, String expectedHash) throws Exception {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`dependencies {`
`2`		`- implementation 'org.testcontainers:testcontainers:1.17.3'`
	`2`	`+ implementation 'org.testcontainers:testcontainers:1.20.1'`
`3`	`3`	`implementation 'org.junit.jupiter:junit-jupiter-api:5.9.0'`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package com.strategyobject.substrateclient.tests.containers;`
`2`	`2`
`3`	`3`	`public class FrequencyVersion {`
`4`		`- public static final String CURRENT_VERSION = "v1.15.0";`
`5`		`- public static final Long SPEC = 131L;`
	`4`	`+ public static final String CURRENT_VERSION = "v1.15.3";`
	`5`	`+ public static final Long SPEC = 141L;`
`6`	`6`
`7`	`7`	`private FrequencyVersion() {`
`8`	`8`	`}`