cleaned up test support packages and paramterized existing tests for …

…solana message encoding

the tests are really slow, need to speed them up somehow - must look at the start-up script for the validator container and see if there's any configuration to tweak to move things along a bit

build.gradle

@@ -61,6 +61,7 @@ dependencies {
     testSupportImplementation 'com.lmax:simple-dsl:3.0.0'
     testSupportImplementation 'org.assertj:assertj-core:3.25.3'
     testSupportImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testSupportImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2'
     testSupportImplementation 'com.fasterxml.jackson.core:jackson-core:2.17.1'
     testSupportImplementation 'com.fasterxml.jackson.core:jackson-databind:2.17.1'
     testSupportImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
@@ -69,6 +70,7 @@ dependencies {
     // test dependencies
     testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2'
     testImplementation 'org.apache.logging.log4j:log4j-slf4j2-impl:2.23.1'
     testImplementation 'org.slf4j:slf4j-api:2.0.13'
 

src/integration-test/java/com/lmax/solana4j/programs/AddressLookupTableProgramIntegrationTest.java

@@ -1,9 +1,10 @@
 package com.lmax.solana4j.programs;
 
+import com.lmax.solana4j.base.IntegrationTestBase;
+import com.lmax.solana4j.base.ParameterizedMessageEncodingTest;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 
-final class AddressLookupTableProgramIntegrationTest extends V0EncodingIntegrationTest
+final class AddressLookupTableProgramIntegrationTest extends IntegrationTestBase
 {
     @BeforeEach
     void beforeEachTest()
@@ -13,16 +14,20 @@ void beforeEachTest()
         solana.createKeyPair("addressLookupTableAuthority");
     }
 
-    @Test
-    void shouldCreateAddressLookupTable()
+    @ParameterizedMessageEncodingTest
+    void shouldCreateAddressLookupTable(final String messageEncoding)
     {
+        solana.setMessageEncoding(messageEncoding);
+
         solana.createAddressLookupTable("lookupTableAddress", "addressLookupTableAuthority", "payer");
         solana.retrieveAddressLookupTable("lookupTableAddress");
     }
 
-    @Test
-    void shouldExtendAddressLookupTable()
+    @ParameterizedMessageEncodingTest
+    void shouldExtendAddressLookupTable(final String messageEncoding)
     {
+        solana.setMessageEncoding(messageEncoding);
+
         solana.createAddressLookupTable("lookupTableAddress", "addressLookupTableAuthority", "payer");
 
         solana.createKeyPair("addressForLookupTable1");

src/test-support/java/com/lmax/solana4j/SolanaDriver.java

@@ -2,11 +2,16 @@
 
 import com.lmax.solana4j.api.AddressLookupTable;
 import com.lmax.solana4j.api.Slot;
+import com.lmax.solana4j.domain.TestKeyPair;
+import com.lmax.solana4j.domain.TestPublicKey;
 import com.lmax.solana4j.programs.AddressWithBumpSeed;
-import com.lmax.solana4j.testclient.api.AccountInfo;
-import com.lmax.solana4j.testclient.api.Commitment;
-import com.lmax.solana4j.testclient.api.SolanaApi;
-import com.lmax.solana4j.testclient.api.TransactionResponse;
+import com.lmax.solana4j.client.api.AccountInfo;
+import com.lmax.solana4j.client.api.Commitment;
+import com.lmax.solana4j.client.api.SolanaApi;
+import com.lmax.solana4j.client.api.TransactionResponse;
+import com.lmax.solana4j.transaction.LegacyTransactionFactory;
+import com.lmax.solana4j.transaction.TransactionFactory;
+import com.lmax.solana4j.transaction.V0TransactionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,7 +58,7 @@ public String createAddressLookupTable(final AddressWithBumpSeed addressWithBump
                                            final Slot slot,
                                            final List<AddressLookupTable> addressLookupTables)
     {
-        final com.lmax.solana4j.testclient.api.Blockhash recentBlockhash = solanaApi.getRecentBlockHash();
+        final com.lmax.solana4j.client.api.Blockhash recentBlockhash = solanaApi.getRecentBlockHash();
 
         final String transactionBlob = getTransactionFactory().createAddressLookupTable(
                 addressWithBumpSeed,
@@ -74,7 +79,7 @@ public String extendAddressLookupTable(final TestPublicKey addressLookupTable,
                                            final List<TestPublicKey> addressesToAdd,
                                            final List<AddressLookupTable> addressLookupTables)
     {
-        final com.lmax.solana4j.testclient.api.Blockhash recentBlockhash = solanaApi.getRecentBlockHash();
+        final com.lmax.solana4j.client.api.Blockhash recentBlockhash = solanaApi.getRecentBlockHash();
 
         final String transactionBlob = getTransactionFactory().extendAddressLookupTable(
                 addressLookupTable.getSolana4jPublicKey(),

src/test-support/java/com/lmax/solana4j/SolanaNodeDsl.java

@@ -5,20 +5,24 @@
 import com.lmax.simpledsl.api.RequiredArg;
 import com.lmax.solana4j.api.AddressLookupTable;
 import com.lmax.solana4j.api.PublicKey;
-import com.lmax.solana4j.assertions.IsEqualToAssertion;
-import com.lmax.solana4j.assertions.IsNotNullAssertion;
+import com.lmax.solana4j.assertion.IsEqualToAssertion;
+import com.lmax.solana4j.assertion.IsNotNullAssertion;
+import com.lmax.solana4j.domain.Sol;
+import com.lmax.solana4j.domain.TestKeyPair;
+import com.lmax.solana4j.domain.TestKeyPairGenerator;
+import com.lmax.solana4j.domain.TestPublicKey;
 import com.lmax.solana4j.programs.AddressLookupTableProgram;
 import com.lmax.solana4j.programs.AddressWithBumpSeed;
-import com.lmax.solana4j.testclient.api.AccountInfo;
-import com.lmax.solana4j.testclient.api.Commitment;
-import com.lmax.solana4j.testclient.jsonrpc.SolanaClient;
+import com.lmax.solana4j.client.api.AccountInfo;
+import com.lmax.solana4j.client.api.Commitment;
+import com.lmax.solana4j.client.jsonrpc.SolanaClient;
 import org.bouncycastle.util.encoders.Base64;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static com.lmax.solana4j.testclient.api.Commitment.FINALIZED;
+import static com.lmax.solana4j.client.api.Commitment.FINALIZED;
 import static java.util.Arrays.stream;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 

src/test-support/java/com/lmax/solana4j/TestContext.java

@@ -1,6 +1,8 @@
 package com.lmax.solana4j;
 
 import com.lmax.solana4j.api.AddressLookupTable;
+import com.lmax.solana4j.domain.TestKeyPair;
+import com.lmax.solana4j.domain.TestPublicKey;
 
 import java.util.HashMap;
 import java.util.Map;

src/test-support/java/com/lmax/solana4j/Waiter.java

@@ -1,6 +1,6 @@
 package com.lmax.solana4j;
 
-import com.lmax.solana4j.assertions.Assertion;
+import com.lmax.solana4j.assertion.Assertion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/test-support/java/com/lmax/solana4j/assertions/Assertion.java → src/test-support/java/com/lmax/solana4j/assertion/Assertion.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.assertions;
+package com.lmax.solana4j.assertion;
 
 public abstract class Assertion<T>
 {

src/test-support/java/com/lmax/solana4j/assertions/IsEqualToAssertion.java → src/test-support/java/com/lmax/solana4j/assertion/IsEqualToAssertion.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.assertions;
+package com.lmax.solana4j.assertion;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/test-support/java/com/lmax/solana4j/assertions/IsNotNullAssertion.java → src/test-support/java/com/lmax/solana4j/assertion/IsNotNullAssertion.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.assertions;
+package com.lmax.solana4j.assertion;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/integration-test/java/com/lmax/solana4j/programs/IntegrationTestBase.java → src/test-support/java/com/lmax/solana4j/base/IntegrationTestBase.java

@@ -1,11 +1,11 @@
-package com.lmax.solana4j.programs;
+package com.lmax.solana4j.base;
 
 import com.lmax.solana4j.SolanaNodeDsl;
 import org.junit.jupiter.api.BeforeEach;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 
-abstract class IntegrationTestBase
+public abstract class IntegrationTestBase
 {
     public static final int SOLANA_HTTP_PORT = 8899;
     public static final int SOLANA_WS_PORT = 8900;

src/test-support/java/com/lmax/solana4j/base/MessageEncodingArgumentsParameter.java

@@ -0,0 +1,19 @@
+package com.lmax.solana4j.base;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ArgumentsProvider;
+
+import java.util.stream.Stream;
+
+public class MessageEncodingArgumentsParameter implements ArgumentsProvider
+{
+    @Override
+    public Stream<? extends Arguments> provideArguments(final ExtensionContext context)
+    {
+        return Stream.of(
+                Arguments.of("V0"),
+                Arguments.of("Legacy")
+        );
+    }
+}

src/test-support/java/com/lmax/solana4j/base/ParameterizedMessageEncodingTest.java

@@ -0,0 +1,17 @@
+package com.lmax.solana4j.base;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ArgumentsSource;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@ParameterizedTest(name = "{index}: (Message Encoding {0})")
+@ArgumentsSource(MessageEncodingArgumentsParameter.class)
+public @interface ParameterizedMessageEncodingTest
+{
+}

src/test-support/java/com/lmax/solana4j/testclient/api/AccountInfo.java → src/test-support/java/com/lmax/solana4j/client/api/AccountInfo.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 import java.util.List;
 

src/test-support/java/com/lmax/solana4j/testclient/api/AccountInfoParsedData.java → src/test-support/java/com/lmax/solana4j/client/api/AccountInfoParsedData.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 import java.util.Map;
 

src/test-support/java/com/lmax/solana4j/testclient/api/AccountKey.java → src/test-support/java/com/lmax/solana4j/client/api/AccountKey.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface AccountKey
 {

src/test-support/java/com/lmax/solana4j/testclient/api/AddressTableLookup.java → src/test-support/java/com/lmax/solana4j/client/api/AddressTableLookup.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 import java.util.List;
 

src/test-support/java/com/lmax/solana4j/testclient/api/BlockResponse.java → src/test-support/java/com/lmax/solana4j/client/api/BlockResponse.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 import java.util.List;
 

src/test-support/java/com/lmax/solana4j/testclient/api/Blockhash.java → src/test-support/java/com/lmax/solana4j/client/api/Blockhash.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface Blockhash
 {

src/test-support/java/com/lmax/solana4j/testclient/api/Commitment.java → src/test-support/java/com/lmax/solana4j/client/api/Commitment.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public enum Commitment
 {

src/test-support/java/com/lmax/solana4j/testclient/api/Context.java → src/test-support/java/com/lmax/solana4j/client/api/Context.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface Context
 {

src/test-support/java/com/lmax/solana4j/testclient/api/Encoding.java → src/test-support/java/com/lmax/solana4j/client/api/Encoding.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public enum Encoding
 {

src/test-support/java/com/lmax/solana4j/testclient/api/Header.java → src/test-support/java/com/lmax/solana4j/client/api/Header.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface Header
 {

src/test-support/java/com/lmax/solana4j/testclient/api/InnerInstruction.java → src/test-support/java/com/lmax/solana4j/client/api/InnerInstruction.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 import java.util.List;
 

src/test-support/java/com/lmax/solana4j/testclient/api/Instruction.java → src/test-support/java/com/lmax/solana4j/client/api/Instruction.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 import java.util.List;
 

src/test-support/java/com/lmax/solana4j/testclient/api/Message.java → src/test-support/java/com/lmax/solana4j/client/api/Message.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 import java.util.List;
 

src/test-support/java/com/lmax/solana4j/testclient/api/ProgramAccountResponse.java → src/test-support/java/com/lmax/solana4j/client/api/ProgramAccountResponse.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface ProgramAccountResponse
 {

src/test-support/java/com/lmax/solana4j/testclient/api/Reward.java → src/test-support/java/com/lmax/solana4j/client/api/Reward.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface Reward
 {

src/test-support/java/com/lmax/solana4j/testclient/api/SignatureInfo.java → src/test-support/java/com/lmax/solana4j/client/api/SignatureInfo.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface SignatureInfo
 {

src/test-support/java/com/lmax/solana4j/testclient/api/SignatureStatus.java → src/test-support/java/com/lmax/solana4j/client/api/SignatureStatus.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface SignatureStatus
 {

src/test-support/java/com/lmax/solana4j/testclient/api/SolanaApi.java → src/test-support/java/com/lmax/solana4j/client/api/SolanaApi.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface SolanaApi
 {

src/test-support/java/com/lmax/solana4j/testclient/api/SolanaRpcResponse.java → src/test-support/java/com/lmax/solana4j/client/api/SolanaRpcResponse.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface SolanaRpcResponse<T>
 {

src/test-support/java/com/lmax/solana4j/testclient/api/TokenAccount.java → src/test-support/java/com/lmax/solana4j/client/api/TokenAccount.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface TokenAccount
 {

src/test-support/java/com/lmax/solana4j/testclient/api/TokenAmount.java → src/test-support/java/com/lmax/solana4j/client/api/TokenAmount.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface TokenAmount
 {

src/test-support/java/com/lmax/solana4j/testclient/api/TokenBalance.java → src/test-support/java/com/lmax/solana4j/client/api/TokenBalance.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface TokenBalance
 {

src/test-support/java/com/lmax/solana4j/testclient/api/Transaction.java → src/test-support/java/com/lmax/solana4j/client/api/Transaction.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface Transaction
 {

src/test-support/java/com/lmax/solana4j/testclient/api/TransactionData.java → src/test-support/java/com/lmax/solana4j/client/api/TransactionData.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 import java.util.List;
 

src/test-support/java/com/lmax/solana4j/testclient/api/TransactionMetadata.java → src/test-support/java/com/lmax/solana4j/client/api/TransactionMetadata.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 import java.util.List;
 

src/test-support/java/com/lmax/solana4j/testclient/api/TransactionResponse.java → src/test-support/java/com/lmax/solana4j/client/api/TransactionResponse.java

@@ -1,4 +1,4 @@
-package com.lmax.solana4j.testclient.api;
+package com.lmax.solana4j.client.api;
 
 public interface TransactionResponse
 {