Merge pull request #150 from 0xsequence/Tests/endToEndSetup

Tests/end to end setup

Author: colezemind

Config/DefaultGame.ini

@@ -1,6 +1,7 @@
 
 [/Script/EngineSettings.GeneralProjectSettings]
 ProjectID=8F4908F147D21EABA451CCA80ECFA2DE
+CopyrightNotice=Copyright 2024 Horizon Blockchain Games Inc. All rights reserved.
 
 [StartupActions]
 bAddPacks=True

Content/StarterContent/Architecture/Wall_Door_400x400.uasset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31cbec41a1f814fb1aed3263b1b50f70f8d465f57934d5acda6004df67ae6a0b
-size 16392
+oid sha256:1b4caf8e1d21ff3d5489e1f8acbdf42ae59867bc00b425af29d077d7f2c68136
+size 17636

Content/StarterContent/Maps/Minimal_Default.umap

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1c1ec07176945099c15d77f1e9df28a45c45b702200afb4f8be8d11ebe1e21de
-size 63363
+oid sha256:c87a71281a8741750325d976997db07632f5ded7c5e260ad22f0ebf5a6d28505
+size 54552

Plugins/SequencePlugin/Source/SequencePlugin/Private/GeneralTesting.cpp

@@ -284,8 +284,8 @@ void AGeneralTesting::TestHistory() const
 		FSeqGetTransactionHistoryArgs args;
 		args.filter.accountAddress = Api->GetWalletAddress();
 		args.includeMetaData = true;
-		args.page.page = 0;
-		args.page.more = true;
+		args.page->page = 0;
+		args.page->more = true;
 		Api->GetTransactionHistory(args,GenericSuccess,GenericFailure);
 	}
 }

Plugins/SequencePlugin/Source/SequencePlugin/Private/Tests/IndexerTests.cpp

@@ -218,8 +218,8 @@ void GetTransactionHistoryTest(UIndexer* Indexer, TFunction<void(FString)> OnSuc
 	FSeqGetTransactionHistoryArgs Args;
 	Args.filter.accountAddress = "0x0E0f9d1c4BeF9f0B8a2D9D4c09529F260C7758A2";
 	Args.includeMetaData = true;
-	Args.page.page = 0;
-	Args.page.more = true;
+	Args.page->page = 0;
+	Args.page->more = true;
 	Indexer->GetTransactionHistory(GTestingChainID, Args, GenericSuccess, GenericFailure);
 }
 

Plugins/SequencePlugin/Source/SequencePlugin/Private/Util/SequenceSupport.cpp

@@ -28,6 +28,11 @@ FString USequenceSupport::GetNetworkNameForUrl(const int64 NetworkIdIn)
 	return TEXT("");
 }
 
+bool USequenceSupport::IsNetworkIdSupported(const int64 NetworkIdIn)
+{
+	return NetworkIdToNameMap.Contains(NetworkIdIn);
+}
+
 int64 USequenceSupport::GetNetworkId(const FString& NetworkNameIn)
 {
 	FString SearchKey = NetworkNameIn.ToLower();

Plugins/SequencePlugin/Source/SequencePlugin/Public/Indexer/Structs/SeqGetTokenSuppliesArgs.h

@@ -2,6 +2,7 @@
 #pragma once
 
 #include "CoreMinimal.h"
+#include "SeqPage.h"
 #include "SeqGetTokenSuppliesArgs.generated.h"
 
 USTRUCT(BlueprintType)
@@ -13,7 +14,27 @@ struct SEQUENCEPLUGIN_API FSeqGetTokenSuppliesArgs
         FString contractAddress = "";
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
         bool includeMetaData = false;
+    UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
+        TOptional<FSeqPage> page;
+
+    bool customGetter = true;
+    FString GetArgs() { 
+        TSharedPtr<FJsonObject> JsonObject = MakeShared<FJsonObject>();
+    
+        JsonObject->SetStringField("contractAddress", contractAddress);
+        JsonObject->SetBoolField("includeMetaData", includeMetaData);
+    
+        if (page.IsSet())
+        {
+            TSharedPtr<FJsonObject> PageObject = MakeShared<FJsonObject>();
+            FJsonObjectConverter::UStructToJsonObject(FSeqPage::StaticStruct(), &(page.GetValue()), PageObject.ToSharedRef(), 0, 0);
+            JsonObject->SetObjectField("page", PageObject);
+        }
+
+        FString OutputString = "";
+        TSharedRef<TJsonWriter<>> Writer = TJsonWriterFactory<>::Create(&OutputString);
+        FJsonSerializer::Serialize(JsonObject.ToSharedRef(), Writer);
 
-    bool customGetter = false;
-    FString GetArgs() { return ""; }//no custom getter needed here!
+        return OutputString;
+    }
 };

Plugins/SequencePlugin/Source/SequencePlugin/Public/Indexer/Structs/SeqGetTokenSuppliesMapArgs.h

@@ -59,8 +59,9 @@ struct SEQUENCEPLUGIN_API FSeqGetTokenSuppliesMapArgs
 
 		for (FString key : keys)
 		{
-			ret += "\"" + key + "\":" + USequenceSupport::StringListToParsableString(tokenMap.Find(key)->token_list);
+			ret += "\"" + key + "\":" + USequenceSupport::StringListToParsableString(tokenMap.Find(key)->token_list) + ",";
 		}
+		ret = ret.LeftChop(1); //remove the last comma
 		ret += "},";//close off tokenMap subObject
 		ret += "\"includeMetaData\":";
 		ret += includeMetaData ? "true" : "false";

Plugins/SequencePlugin/Source/SequencePlugin/Public/Indexer/Structs/SeqGetTransactionHistoryArgs.h

@@ -15,24 +15,23 @@ struct SEQUENCEPLUGIN_API FSeqGetTransactionHistoryArgs
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
         FSeqTransactionHistoryFilter filter;
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
-        FSeqPage page;
+        TOptional<FSeqPage> page;
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
         bool includeMetaData = false;
 
     bool customGetter = true;
-    /// <summary>
-    /// 
-    /// </summary>
-    /// <returns>The jsonString from this UStruct formatted proper!</returns>
     FString GetArgs()
     {
         FString ret = "{";
         ret.Append("\"filter\":");
         ret.Append(filter.GetArgs());//get the args! MUST Have this!
-        if (page.containsData())
+        if (page.IsSet())
         {
-            ret.Append(",\"page\":");
-            ret.Append(page.GetArgs());
+            ret.Append(".\"page\":");
+            ret.Append(page.GetValue().GetArgs());
+            TSharedPtr<FJsonObject> PageObject = MakeShared<FJsonObject>();
+            FJsonObjectConverter::UStructToJsonObject(FSeqPage::StaticStruct(), &(page.GetValue()), PageObject.ToSharedRef(), 0, 0);
+            
         }
 
         ret.Append(",\"includeMetaData\":");

Plugins/SequencePlugin/Source/SequencePlugin/Public/Indexer/Structs/SeqTokenList.h

@@ -9,12 +9,31 @@
     in UStructs allowing us to support nesting
 */
 
-//For use in GetTokenSuppliesMapArgs
+// For use in GetTokenSuppliesMapArgs
 USTRUCT(BlueprintType)
 struct SEQUENCEPLUGIN_API FSeqTokenList
 {
     GENERATED_USTRUCT_BODY()
+
 public:
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Default")
-        TArray<FString> token_list;
+    TArray<FString> token_list;
+
+    // Default constructor
+    FSeqTokenList() {}
+
+    // Constructor to initialize with a variadic list of FString arguments
+    template<typename... Args>
+    FSeqTokenList(Args... args)
+    {
+        AddTokens(args...);
+    }
+
+private:
+    // Helper function to unpack variadic arguments and add them to the token_list
+    template<typename... Args>
+    void AddTokens(Args... args)
+    {
+        token_list = { args... };
+    }
 };