diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Private/Marketplace/SequenceMarketplace.cpp b/Plugins/SequencePlugin/Source/SequencePlugin/Private/Marketplace/SequenceMarketplace.cpp index 7bce8b356..fa3cbf9f5 100644 --- 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> OnSuccess, const FFailureCallback& OnFailure) + TSuccessCallback> OnSuccess, const FFailureCallback& OnFailure) { const FString Args = BuildArgs(FSeqListCollectibleListingsArgs{ ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty()}); - OrderArray.Empty(); + RawOrderArray.Empty(); - return ListAllListingsForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray& Orders, const bool IsDone) + return ListAllListingsForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray& 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> OnSuccess, const FFailureCallback& OnFailure) +void USequenceMarketplace::ListAllOffersForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback> OnSuccess, const FFailureCallback& OnFailure) { const FString Args = BuildArgs(FSeqListCollectibleListingsArgs{ ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty()}); - OrderArray.Empty(); + RawOrderArray.Empty(); - return ListAllOffersForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray& Orders, bool IsDone) + return ListAllOffersForCollectibleHelper(ChainID, ContractAddress, TokenID, Filter, FSeqMarketplacePage::Empty(), [this, OnSuccess](const TArray& 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, bool)> OnSuccess, const FFailureCallback& OnFailure) + TFunction, 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, bool)> OnSuccess, const FFailureCallback& OnFailure) + TFunction, 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 index cbdb6c134..4833d4257 100644 --- 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> OnApiSuccess = [this, OnSuccess](const TArray& Listings) + const TSuccessCallback> OnApiSuccess = [this, OnSuccess](const TArray& 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> OnApiSuccess = [this, OnSuccess](const TArray& Offers) + const TSuccessCallback> OnApiSuccess = [this, OnSuccess](const TArray& Offers) { OnSuccess.ExecuteIfBound(Offers); }; diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Public/Marketplace/SequenceMarketplace.h b/Plugins/SequencePlugin/Source/SequencePlugin/Public/Marketplace/SequenceMarketplace.h index cb46b7e8d..feb73206f 100644 --- 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 OrderArray; + TArray 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, bool)> OnSuccess, const FFailureCallback& OnFailure); void GetCollectibleOrder(int64 ChainID, const FString& Endpoint, const FSeqGetCollectibleOrderArgs& Args, TSuccessCallback OnSuccess, const FFailureCallback& OnFailure); - void ListAllListingsForCollectibleHelper(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page, TFunction, bool)> OnSuccess, const FFailureCallback& OnFailure); - void ListAllOffersForCollectibleHelper(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page, TFunction, bool)> OnSuccess, const FFailureCallback& OnFailure); + void ListAllListingsForCollectibleHelper(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page, TFunction, bool)> OnSuccess, const FFailureCallback& OnFailure); + void ListAllOffersForCollectibleHelper(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, const FSeqMarketplacePage& Page, TFunction, 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> OnSuccess, const FFailureCallback& OnFailure); + void ListAllListingsForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback> 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> OnSuccess, const FFailureCallback& OnFailure); + void ListAllOffersForCollectible(const int64 ChainID, const FString& ContractAddress, const FString& TokenID, const FSeqCollectiblesFilter& Filter, TSuccessCallback> 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 index f05be661b..55921d79d 100644 --- 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 Listings; + TArray Listings; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Collectibles") FSeqMarketplacePage Page; @@ -36,7 +36,7 @@ struct SEQUENCEPLUGIN_API FSeqListCollectibleListingsReturn // Convert CollectibleOrders array to JSON TArray> 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 index e728cafef..ecd4de93c 100644 --- 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 Offers; + TArray Offers; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Collectibles") FSeqMarketplacePage Page; @@ -36,7 +36,7 @@ struct SEQUENCEPLUGIN_API FSeqListCollectibleOffersReturn // Convert CollectibleOrders array to JSON TArray> 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 index c1f93305d..6c13f3a3d 100644 --- 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&, Orders, FSeqMarketplacePage, Page); - DECLARE_DYNAMIC_DELEGATE_OneParam(FOnListAllListingsForCollectible, const TArray&, Orders); - DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnListOffersForCollectible, const TArray&, Orders, FSeqMarketplacePage, Page); - DECLARE_DYNAMIC_DELEGATE_OneParam(FOnListAllOffersForCollectible, const TArray&, Orders); + DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnListListingsForCollectible, const TArray&, Orders, FSeqMarketplacePage, Page); + DECLARE_DYNAMIC_DELEGATE_OneParam(FOnListAllListingsForCollectible, const TArray&, Orders); + DECLARE_DYNAMIC_DELEGATE_TwoParams(FOnListOffersForCollectible, const TArray&, Orders, FSeqMarketplacePage, Page); + DECLARE_DYNAMIC_DELEGATE_OneParam(FOnListAllOffersForCollectible, const TArray&, 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 index a450bd605..cfa0af1d2 100644 --- 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> GenericSuccess = [this, MarketplaceTestData](TArray Orders) + const TSuccessCallback> GenericSuccess = [this, MarketplaceTestData](TArray 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 index 5c0cfeb3e..03b9e0614 100644 --- 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> GenericSuccess = [this, MarketplaceTestData](TArray Orders) + const TSuccessCallback> GenericSuccess = [this, MarketplaceTestData](TArray 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"; }