Merge pull request #340 from 0xsequence/Fix/marketplace-return-types

andygruening · web-flow · commit 340ebb24f77b · 2025-10-24T14:55:46.000+02:00
fixed marketplace return types for ListAllListingsForCollectible and ListAllOffersForCollectible
diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Private/Marketplace/SequenceMarketplace.cpp b/Plugins/SequencePlugin/Source/SequencePlugin/Private/Marketplace/SequenceMarketplace.cpp
@@ -284,18 +284,18 @@ void USequenceMarketplace::ListListingsForCollectible(const int64 ChainID, const
 
 void USequenceMarketplace::ListAllListingsForCollectible(const int64 ChainID,
 	const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter,
-	TSuccessCallback<TArray<FSeqCollectibleOrder>> OnSuccess, const FFailureCallback& OnFailure)
+	TSuccessCallback<TArray<FSeqOrder>> OnSuccess, const FFailureCallback& OnFailure)
 {
 	const FString Args = BuildArgs<FSeqListCollectibleListingsArgs>(FSeqListCollectibleListingsArgs{ ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty()});
-	OrderArray.Empty();
+	RawOrderArray.Empty();
 
-	return ListAllListingsForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray<FSeqCollectibleOrder>& Orders, const bool IsDone)
+	return ListAllListingsForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray<FSeqOrder>& Orders, const bool IsDone)
 	{
-		OrderArray.Append(Orders);
+		RawOrderArray.Append(Orders);
 
 		if(IsDone)
 		{
-			OnSuccess(OrderArray);
+			OnSuccess(RawOrderArray);
 		}
 	}, OnFailure);
 }
@@ -313,18 +313,18 @@ void USequenceMarketplace::ListOffersForCollectible(const int64 ChainID, const F
 		}, OnFailure);
 }
 
-void USequenceMarketplace::ListAllOffersForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqCollectibleOrder>> OnSuccess, const FFailureCallback& OnFailure)
+void USequenceMarketplace::ListAllOffersForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqOrder>> OnSuccess, const FFailureCallback& OnFailure)
 {
 	const FString Args = BuildArgs<FSeqListCollectibleListingsArgs>(FSeqListCollectibleListingsArgs{ ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty()});
-	OrderArray.Empty();
+	RawOrderArray.Empty();
 
-	return ListAllOffersForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray<FSeqCollectibleOrder>& Orders, bool IsDone)
+	return ListAllOffersForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray<FSeqOrder>& Orders, bool IsDone)
 	{
-		OrderArray.Append(Orders);
+		RawOrderArray.Append(Orders);
 
 		if(IsDone)
 		{
-			OnSuccess(OrderArray);
+			OnSuccess(RawOrderArray);
 		}
 	}, OnFailure);
 }
@@ -402,7 +402,7 @@ void USequenceMarketplace::GetCollectibleOrder(const int64 ChainID, const FStrin
 
 void USequenceMarketplace::ListAllListingsForCollectibleHelper(const int64 ChainID, const FString& ContractAddress,
 	const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page,
-	TFunction<void(TArray<FSeqCollectibleOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure)
+	TFunction<void(TArray<FSeqOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure)
 {
 	ListListingsForCollectible(ChainID, ContractAddress, TokenID, Filter, Page, [ChainID, ContractAddress, Filter, TokenID, this, OnSuccess, OnFailure](const FSeqListCollectibleListingsReturn& CollectiblesReturn)
 	{
@@ -422,7 +422,7 @@ void USequenceMarketplace::ListAllListingsForCollectibleHelper(const int64 Chain
 
 void USequenceMarketplace::ListAllOffersForCollectibleHelper(const int64 ChainID, const FString& ContractAddress,
 	const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page,
-	TFunction<void(TArray<FSeqCollectibleOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure)
+	TFunction<void(TArray<FSeqOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure)
 {
 	ListOffersForCollectible(ChainID, ContractAddress, TokenID, Filter, Page, [ChainID, ContractAddress, Filter, TokenID, this, OnSuccess, OnFailure](const FSeqListCollectibleOffersReturn& CollectiblesReturn)
 	{
diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Private/Subsystems/SequenceMarketplaceBP.cpp b/Plugins/SequencePlugin/Source/SequencePlugin/Private/Subsystems/SequenceMarketplaceBP.cpp
@@ -172,7 +172,7 @@ void USequenceMarketplaceBP::ListListingsForCollectible(const FString& ContractA
 
 void USequenceMarketplaceBP::ListAllListingsForCollectible(const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter Filter, FOnListAllListingsForCollectible OnSuccess, FOnFailure OnFailure)
 {
-	const TSuccessCallback<TArray<FSeqCollectibleOrder>> OnApiSuccess = [this, OnSuccess](const TArray<FSeqCollectibleOrder>& Listings)
+	const TSuccessCallback<TArray<FSeqOrder>> OnApiSuccess = [this, OnSuccess](const TArray<FSeqOrder>& Listings)
 	{
 		OnSuccess.ExecuteIfBound(Listings);
 	};
@@ -204,7 +204,7 @@ void USequenceMarketplaceBP::ListOffersForCollectible(const FString& ContractAdd
 
 void USequenceMarketplaceBP::ListAllOffersForCollectible(const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter Filter, FOnListAllOffersForCollectible OnSuccess, FOnFailure OnFailure)
 {
-	const TSuccessCallback<TArray<FSeqCollectibleOrder>> OnApiSuccess = [this, OnSuccess](const TArray<FSeqCollectibleOrder>& Offers)
+	const TSuccessCallback<TArray<FSeqOrder>> OnApiSuccess = [this, OnSuccess](const TArray<FSeqOrder>& Offers)
 	{
 		OnSuccess.ExecuteIfBound(Offers);
 	};
diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Public/Marketplace/SequenceMarketplace.h b/Plugins/SequencePlugin/Source/SequencePlugin/Public/Marketplace/SequenceMarketplace.h
@@ -19,6 +19,7 @@ class SEQUENCEPLUGIN_API USequenceMarketplace : public UObject
 	const FString PATH = "/rpc/Marketplace/";
 
 	TArray<FSeqCollectibleOrder> OrderArray;
+	TArray<FSeqOrder> RawOrderArray;
 
 	//private functions
 
@@ -37,8 +38,8 @@ class SEQUENCEPLUGIN_API USequenceMarketplace : public UObject
 	void ListAllCollectibleOffersWithHighestPricedOfferFirstHelper(const int64 ChainID, const FString& ContractAddress, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page, TFunction<void(TArray<FSeqCollectibleOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure);
 	void GetCollectibleOrder(int64 ChainID, const FString& Endpoint, const FSeqGetCollectibleOrderArgs& Args,
 	                         TSuccessCallback<FSeqCollectibleOrder> OnSuccess, const FFailureCallback& OnFailure);
-	void ListAllListingsForCollectibleHelper(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page, TFunction<void(TArray<FSeqCollectibleOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure);
-	void ListAllOffersForCollectibleHelper(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page, TFunction<void(TArray<FSeqCollectibleOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure);
+	void ListAllListingsForCollectibleHelper(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page, TFunction<void(TArray<FSeqOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure);
+	void ListAllOffersForCollectibleHelper(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page, TFunction<void(TArray<FSeqOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure);
 	
 public:
 	
@@ -183,7 +184,7 @@ class SEQUENCEPLUGIN_API USequenceMarketplace : public UObject
 	 * @param OnSuccess handler for success, takes in a TArray of FSeqCollectibleOrder
 	 * @param OnFailure handler for failure, takes in a FSequenceError
 	 */
-	void ListAllListingsForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqCollectibleOrder>> OnSuccess, const FFailureCallback& OnFailure);
+	void ListAllListingsForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqOrder>> OnSuccess, const FFailureCallback& OnFailure);
 
 	/**
 	 * Get offers for a collectible
@@ -206,7 +207,7 @@ class SEQUENCEPLUGIN_API USequenceMarketplace : public UObject
 	 * @param OnSuccess handler for success, takes in a TArray of FSeqCollectibleOrder
 	 * @param OnFailure handler for failure, takes in a FSequenceError
 	 */
-	void ListAllOffersForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqCollectibleOrder>> OnSuccess, const FFailureCallback& OnFailure);
+	void ListAllOffersForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqOrder>> OnSuccess, const FFailureCallback& OnFailure);
 
 	/**
 	 * Get the floor order for a collectible
diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Public/Marketplace/Structs/SeqListCollectibleListingsReturn.h b/Plugins/SequencePlugin/Source/SequencePlugin/Public/Marketplace/Structs/SeqListCollectibleListingsReturn.h
@@ -14,7 +14,7 @@ struct SEQUENCEPLUGIN_API FSeqListCollectibleListingsReturn
 public:
 
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Collectibles")
-    TArray<FSeqCollectibleOrder> Listings;
+    TArray<FSeqOrder> Listings;
 
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Collectibles")
     FSeqMarketplacePage Page;
@@ -36,7 +36,7 @@ struct SEQUENCEPLUGIN_API FSeqListCollectibleListingsReturn
 
         // Convert CollectibleOrders array to JSON
         TArray<TSharedPtr<FJsonObject>> collectibleOrdersList;
-        for (FSeqCollectibleOrder order : Listings)
+        for (FSeqOrder order : Listings)
         {
             collectibleOrdersList.Add(order.GetJson());
         }
diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Public/Marketplace/Structs/SeqListCollectibleOffersReturn.h b/Plugins/SequencePlugin/Source/SequencePlugin/Public/Marketplace/Structs/SeqListCollectibleOffersReturn.h
@@ -14,7 +14,7 @@ struct SEQUENCEPLUGIN_API FSeqListCollectibleOffersReturn
 public:
 
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Collectibles")
-    TArray<FSeqCollectibleOrder> Offers;
+    TArray<FSeqOrder> Offers;
 
     UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Collectibles")
     FSeqMarketplacePage Page;
@@ -36,7 +36,7 @@ struct SEQUENCEPLUGIN_API FSeqListCollectibleOffersReturn
 
         // Convert CollectibleOrders array to JSON
         TArray<TSharedPtr<FJsonObject>> collectibleOrdersList;
-        for (FSeqCollectibleOrder order : Offers)
+        for (FSeqOrder order : Offers)
         {
             collectibleOrdersList.Add(order.GetJson());
         }
diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Public/Subsystems/SequenceMarketplaceBP.h b/Plugins/SequencePlugin/Source/SequencePlugin/Public/Subsystems/SequenceMarketplaceBP.h
@@ -21,10 +21,10 @@ class SEQUENCEPLUGIN_API USequenceMarketplaceBP : public UGameInstanceSubsystem
 	DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnGetHighestPriceOfferForCollectible, FSeqTokenMetaData, TokenMetadata, FSeqOrder, Order);
 	DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnGetLowestPriceListingForCollectible, FSeqTokenMetaData, TokenMetadata, FSeqOrder, Order);
 	DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnGetHighestPriceListingForCollectible, FSeqTokenMetaData, TokenMetadata, FSeqOrder, Order);
-	DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnListListingsForCollectible, const TArray<FSeqCollectibleOrder>&, Orders, FSeqMarketplacePage, Page);
-	DECLARE_DYNAMIC_DELEGATE_OneParam(FOnListAllListingsForCollectible, const TArray<FSeqCollectibleOrder>&, Orders);
-	DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnListOffersForCollectible, const TArray<FSeqCollectibleOrder>&, Orders, FSeqMarketplacePage, Page);
-	DECLARE_DYNAMIC_DELEGATE_OneParam(FOnListAllOffersForCollectible, const TArray<FSeqCollectibleOrder>&, Orders);
+	DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnListListingsForCollectible, const TArray<FSeqOrder>&, Orders, FSeqMarketplacePage, Page);
+	DECLARE_DYNAMIC_DELEGATE_OneParam(FOnListAllListingsForCollectible, const TArray<FSeqOrder>&, Orders);
+	DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnListOffersForCollectible, const TArray<FSeqOrder>&, Orders, FSeqMarketplacePage, Page);
+	DECLARE_DYNAMIC_DELEGATE_OneParam(FOnListAllOffersForCollectible, const TArray<FSeqOrder>&, Orders);
 	DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnGetFloorOrder, FSeqTokenMetaData, TokenMetadata, FSeqOrder, Order);
 	DECLARE_DYNAMIC_DELEGATE_OneParam(FOnFailure, FString, Error);
 	
diff --git a/Plugins/SequenceTests/Source/SequenceTests/Private/MarketplaceEndToEndTests/ListAllListingsForCollectibleTest.cpp b/Plugins/SequenceTests/Source/SequenceTests/Private/MarketplaceEndToEndTests/ListAllListingsForCollectibleTest.cpp
@@ -49,7 +49,7 @@ bool FListAllListingsForCollectible::RunTest(const FString& Parameters)
 
         UMarketplaceRequestsTestData* MarketplaceTestData = UMarketplaceRequestsTestData::Make(1);
         
-        const TSuccessCallback<TArray<FSeqCollectibleOrder>> GenericSuccess = [this, MarketplaceTestData](TArray<FSeqCollectibleOrder> Orders)
+        const TSuccessCallback<TArray<FSeqOrder>> GenericSuccess = [this, MarketplaceTestData](TArray<FSeqOrder> Orders)
         {
             if(Orders.Num() == 0)
             {
@@ -62,7 +62,7 @@ bool FListAllListingsForCollectible::RunTest(const FString& Parameters)
             else
             {
                 FString Message;
-                for(FSeqCollectibleOrder Order : Orders)
+                for(FSeqOrder Order : Orders)
                 {
                     Message += USequenceSupport::StructToString(Order) + "\n";
                 }
diff --git a/Plugins/SequenceTests/Source/SequenceTests/Private/MarketplaceEndToEndTests/ListAllOffersForCollectibleTest.cpp b/Plugins/SequenceTests/Source/SequenceTests/Private/MarketplaceEndToEndTests/ListAllOffersForCollectibleTest.cpp
@@ -49,7 +49,7 @@ bool FListAllOffersForCollectibleTest::RunTest(const FString& Parameters)
 
         UMarketplaceRequestsTestData* MarketplaceTestData = UMarketplaceRequestsTestData::Make(1);
         
-        const TSuccessCallback<TArray<FSeqCollectibleOrder>> GenericSuccess = [this, MarketplaceTestData](TArray<FSeqCollectibleOrder> Orders)
+        const TSuccessCallback<TArray<FSeqOrder>> GenericSuccess = [this, MarketplaceTestData](TArray<FSeqOrder> Orders)
         {
             if(Orders.Num() == 0)
             {
@@ -62,7 +62,7 @@ bool FListAllOffersForCollectibleTest::RunTest(const FString& Parameters)
             else
             {
                 FString Message;
-                for(FSeqCollectibleOrder Order : Orders)
+                for(FSeqOrder Order : Orders)
                 {
                     Message += USequenceSupport::StructToString(Order) + "\n";
                 }

Original file line number	Diff line number	Diff line change
`@@ -284,18 +284,18 @@ void USequenceMarketplace::ListListingsForCollectible(const int64 ChainID, const`
`284`	`284`
`285`	`285`	`void USequenceMarketplace::ListAllListingsForCollectible(const int64 ChainID,`
`286`	`286`	`const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter,`
`287`		`- TSuccessCallback<TArray<FSeqCollectibleOrder>> OnSuccess, const FFailureCallback& OnFailure)`
	`287`	`+ TSuccessCallback<TArray<FSeqOrder>> OnSuccess, const FFailureCallback& OnFailure)`
`288`	`288`	`{`
`289`	`289`	`const FString Args = BuildArgs<FSeqListCollectibleListingsArgs>(FSeqListCollectibleListingsArgs{ ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty()});`
`290`		`- OrderArray.Empty();`
	`290`	`+ RawOrderArray.Empty();`
`291`	`291`
`292`		`- return ListAllListingsForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray<FSeqCollectibleOrder>& Orders, const bool IsDone)`
	`292`	`+ return ListAllListingsForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray<FSeqOrder>& Orders, const bool IsDone)`
`293`	`293`	`{`
`294`		`- OrderArray.Append(Orders);`
	`294`	`+ RawOrderArray.Append(Orders);`
`295`	`295`
`296`	`296`	`if(IsDone)`
`297`	`297`	`{`
`298`		`- OnSuccess(OrderArray);`
	`298`	`+ OnSuccess(RawOrderArray);`
`299`	`299`	`}`
`300`	`300`	`}, OnFailure);`
`301`	`301`	`}`
`@@ -313,18 +313,18 @@ void USequenceMarketplace::ListOffersForCollectible(const int64 ChainID, const F`
`313`	`313`	`}, OnFailure);`
`314`	`314`	`}`
`315`	`315`
`316`		`-void USequenceMarketplace::ListAllOffersForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqCollectibleOrder>> OnSuccess, const FFailureCallback& OnFailure)`
	`316`	`+void USequenceMarketplace::ListAllOffersForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback<TArray<FSeqOrder>> OnSuccess, const FFailureCallback& OnFailure)`
`317`	`317`	`{`
`318`	`318`	`const FString Args = BuildArgs<FSeqListCollectibleListingsArgs>(FSeqListCollectibleListingsArgs{ ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty()});`
`319`		`- OrderArray.Empty();`
	`319`	`+ RawOrderArray.Empty();`
`320`	`320`
`321`		`- return ListAllOffersForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray<FSeqCollectibleOrder>& Orders, bool IsDone)`
	`321`	`+ return ListAllOffersForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray<FSeqOrder>& Orders, bool IsDone)`
`322`	`322`	`{`
`323`		`- OrderArray.Append(Orders);`
	`323`	`+ RawOrderArray.Append(Orders);`
`324`	`324`
`325`	`325`	`if(IsDone)`
`326`	`326`	`{`
`327`		`- OnSuccess(OrderArray);`
	`327`	`+ OnSuccess(RawOrderArray);`
`328`	`328`	`}`
`329`	`329`	`}, OnFailure);`
`330`	`330`	`}`
`@@ -402,7 +402,7 @@ void USequenceMarketplace::GetCollectibleOrder(const int64 ChainID, const FStrin`
`402`	`402`
`403`	`403`	`void USequenceMarketplace::ListAllListingsForCollectibleHelper(const int64 ChainID, const FString& ContractAddress,`
`404`	`404`	`const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page,`
`405`		`- TFunction<void(TArray<FSeqCollectibleOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure)`
	`405`	`+ TFunction<void(TArray<FSeqOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure)`
`406`	`406`	`{`
`407`	`407`	`ListListingsForCollectible(ChainID, ContractAddress, TokenID, Filter, Page, [ChainID, ContractAddress, Filter, TokenID, this, OnSuccess, OnFailure](const FSeqListCollectibleListingsReturn& CollectiblesReturn)`
`408`	`408`	`{`
`@@ -422,7 +422,7 @@ void USequenceMarketplace::ListAllListingsForCollectibleHelper(const int64 Chain`
`422`	`422`
`423`	`423`	`void USequenceMarketplace::ListAllOffersForCollectibleHelper(const int64 ChainID, const FString& ContractAddress,`
`424`	`424`	`const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page,`
`425`		`- TFunction<void(TArray<FSeqCollectibleOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure)`
	`425`	`+ TFunction<void(TArray<FSeqOrder>, bool)> OnSuccess, const FFailureCallback& OnFailure)`
`426`	`426`	`{`
`427`	`427`	`ListOffersForCollectible(ChainID, ContractAddress, TokenID, Filter, Page, [ChainID, ContractAddress, Filter, TokenID, this, OnSuccess, OnFailure](const FSeqListCollectibleOffersReturn& CollectiblesReturn)`
`428`	`428`	`{`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ void USequenceMarketplaceBP::ListListingsForCollectible(const FString& ContractA`
`172`	`172`
`173`	`173`	`void USequenceMarketplaceBP::ListAllListingsForCollectible(const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter Filter, FOnListAllListingsForCollectible OnSuccess, FOnFailure OnFailure)`
`174`	`174`	`{`
`175`		`- const TSuccessCallback<TArray<FSeqCollectibleOrder>> OnApiSuccess = [this, OnSuccess](const TArray<FSeqCollectibleOrder>& Listings)`
	`175`	`+ const TSuccessCallback<TArray<FSeqOrder>> OnApiSuccess = [this, OnSuccess](const TArray<FSeqOrder>& Listings)`
`176`	`176`	`{`
`177`	`177`	`OnSuccess.ExecuteIfBound(Listings);`
`178`	`178`	`};`
`@@ -204,7 +204,7 @@ void USequenceMarketplaceBP::ListOffersForCollectible(const FString& ContractAdd`
`204`	`204`
`205`	`205`	`void USequenceMarketplaceBP::ListAllOffersForCollectible(const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter Filter, FOnListAllOffersForCollectible OnSuccess, FOnFailure OnFailure)`
`206`	`206`	`{`
`207`		`- const TSuccessCallback<TArray<FSeqCollectibleOrder>> OnApiSuccess = [this, OnSuccess](const TArray<FSeqCollectibleOrder>& Offers)`
	`207`	`+ const TSuccessCallback<TArray<FSeqOrder>> OnApiSuccess = [this, OnSuccess](const TArray<FSeqOrder>& Offers)`
`208`	`208`	`{`
`209`	`209`	`OnSuccess.ExecuteIfBound(Offers);`
`210`	`210`	`};`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ struct SEQUENCEPLUGIN_API FSeqListCollectibleListingsReturn`
`14`	`14`	`public:`
`15`	`15`
`16`	`16`	`UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Collectibles")`
`17`		`- TArray<FSeqCollectibleOrder> Listings;`
	`17`	`+ TArray<FSeqOrder> Listings;`
`18`	`18`
`19`	`19`	`UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Collectibles")`
`20`	`20`	`FSeqMarketplacePage Page;`
`@@ -36,7 +36,7 @@ struct SEQUENCEPLUGIN_API FSeqListCollectibleListingsReturn`
`36`	`36`
`37`	`37`	`// Convert CollectibleOrders array to JSON`
`38`	`38`	`TArray<TSharedPtr<FJsonObject>> collectibleOrdersList;`
`39`		`- for (FSeqCollectibleOrder order : Listings)`
	`39`	`+ for (FSeqOrder order : Listings)`
`40`	`40`	`{`
`41`	`41`	`collectibleOrdersList.Add(order.GetJson());`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ bool FListAllListingsForCollectible::RunTest(const FString& Parameters)`
`49`	`49`
`50`	`50`	`UMarketplaceRequestsTestData* MarketplaceTestData = UMarketplaceRequestsTestData::Make(1);`
`51`	`51`
`52`		`- const TSuccessCallback<TArray<FSeqCollectibleOrder>> GenericSuccess = [this, MarketplaceTestData](TArray<FSeqCollectibleOrder> Orders)`
	`52`	`+ const TSuccessCallback<TArray<FSeqOrder>> GenericSuccess = [this, MarketplaceTestData](TArray<FSeqOrder> Orders)`
`53`	`53`	`{`
`54`	`54`	`if(Orders.Num() == 0)`
`55`	`55`	`{`
`@@ -62,7 +62,7 @@ bool FListAllListingsForCollectible::RunTest(const FString& Parameters)`
`62`	`62`	`else`
`63`	`63`	`{`
`64`	`64`	`FString Message;`
`65`		`- for(FSeqCollectibleOrder Order : Orders)`
	`65`	`+ for(FSeqOrder Order : Orders)`
`66`	`66`	`{`
`67`	`67`	`Message += USequenceSupport::StructToString(Order) + "\n";`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ bool FListAllOffersForCollectibleTest::RunTest(const FString& Parameters)`
`49`	`49`
`50`	`50`	`UMarketplaceRequestsTestData* MarketplaceTestData = UMarketplaceRequestsTestData::Make(1);`
`51`	`51`
`52`		`- const TSuccessCallback<TArray<FSeqCollectibleOrder>> GenericSuccess = [this, MarketplaceTestData](TArray<FSeqCollectibleOrder> Orders)`
	`52`	`+ const TSuccessCallback<TArray<FSeqOrder>> GenericSuccess = [this, MarketplaceTestData](TArray<FSeqOrder> Orders)`
`53`	`53`	`{`
`54`	`54`	`if(Orders.Num() == 0)`
`55`	`55`	`{`
`@@ -62,7 +62,7 @@ bool FListAllOffersForCollectibleTest::RunTest(const FString& Parameters)`
`62`	`62`	`else`
`63`	`63`	`{`
`64`	`64`	`FString Message;`
`65`		`- for(FSeqCollectibleOrder Order : Orders)`
	`65`	`+ for(FSeqOrder Order : Orders)`
`66`	`66`	`{`
`67`	`67`	`Message += USequenceSupport::StructToString(Order) + "\n";`
`68`	`68`	`}`