Move htlc models into models folder

PurpleTheBest · PurpleTheBest · commit a480f29b395f · 2025-03-26T18:11:20.000+04:00
diff --git a/csharp/src/Core.Workflows/Activities/BlockchainActivitiesBase.cs b/csharp/src/Core.Workflows/Activities/BlockchainActivitiesBase.cs
@@ -1,6 +1,5 @@
 ﻿using Train.Solver.Core.Entities;
 using Train.Solver.Core.Models;
-using Train.Solver.Core.Models.HTLCModels;
 using Train.Solver.Core.Repositories;
 
 namespace Train.Solver.Core.Workflows.Activities;
diff --git a/csharp/src/Core.Workflows/Activities/IBlockchainActivities.cs b/csharp/src/Core.Workflows/Activities/IBlockchainActivities.cs
@@ -1,5 +1,4 @@
 ﻿using Train.Solver.Core.Models;
-using Train.Solver.Core.Models.HTLCModels;
 
 namespace Train.Solver.Core.Workflows.Activities;
 
diff --git a/csharp/src/Core.Workflows/Activities/SwapActivities.cs b/csharp/src/Core.Workflows/Activities/SwapActivities.cs
@@ -5,7 +5,6 @@
 using Train.Solver.Core.Entities;
 using Train.Solver.Core.Exceptions;
 using Train.Solver.Core.Models;
-using Train.Solver.Core.Models.HTLCModels;
 using Train.Solver.Core.Repositories;
 using Train.Solver.Core.Services;
 using TransactionResponse = Train.Solver.Core.Models.TransactionResponse;
diff --git a/csharp/src/Core.Workflows/Activities/WorkflowActivities.cs b/csharp/src/Core.Workflows/Activities/WorkflowActivities.cs
@@ -5,7 +5,6 @@
 using Temporalio.Exceptions;
 using Train.Solver.Core.Entities;
 using Train.Solver.Core.Models;
-using Train.Solver.Core.Models.HTLCModels;
 using Train.Solver.Core.Repositories;
 using Train.Solver.Core.Workflows.Helpers;
 using Train.Solver.Core.Workflows.Worklows;
diff --git a/csharp/src/Core.Workflows/Worklows/EventListenerWorkflow.cs b/csharp/src/Core.Workflows/Worklows/EventListenerWorkflow.cs
@@ -1,7 +1,6 @@
 ﻿using Temporalio.Workflows;
 using Train.Solver.Core.Entities;
 using Train.Solver.Core.Models;
-using Train.Solver.Core.Models.HTLCModels;
 using Train.Solver.Core.Workflows.Activities;
 using Train.Solver.Core.Workflows.Helpers;
 using static Temporalio.Workflows.Workflow;
diff --git a/csharp/src/Core.Workflows/Worklows/SwapWorkflow.cs b/csharp/src/Core.Workflows/Worklows/SwapWorkflow.cs
@@ -4,7 +4,6 @@
 using Train.Solver.Core.Entities;
 using Train.Solver.Core.Exceptions;
 using Train.Solver.Core.Models;
-using Train.Solver.Core.Models.HTLCModels;
 using Train.Solver.Core.Workflows.Activities;
 using Train.Solver.Core.Workflows.Helpers;
 using static Temporalio.Workflows.Workflow;
@@ -163,7 +162,7 @@ await ExecuteTransactionAsync(new TransactionContext()
 
                 var childWorkflowTask = ExecuteTransactionAsync(new TransactionContext()
                 {
-                    PrepareArgs = JsonSerializer.Serialize(new HTLCAddLockSigTransactionPrepareRequest
+                    PrepareArgs = JsonSerializer.Serialize(new AddLockSigTransactionPrepareRequest
                     {
                         Id = _htlcCommitMessage.Id,
                         Hashlock = hashlock.Hash,
diff --git a/csharp/src/Core/Models/AddLockSigTransactionPrepareRequest.cs b/csharp/src/Core/Models/AddLockSigTransactionPrepareRequest.cs
@@ -1,6 +1,6 @@
-﻿namespace Train.Solver.Core.Models.HTLCModels;
+﻿namespace Train.Solver.Core.Models;
 
-public class HTLCAddLockSigTransactionPrepareRequest
+public class AddLockSigTransactionPrepareRequest
 {
     public string Id { get; set; } = null!;
 
diff --git a/csharp/src/Core/Models/HTLCBlockEventResponse.cs b/csharp/src/Core/Models/HTLCBlockEventResponse.cs
@@ -1,4 +1,4 @@
-﻿namespace Train.Solver.Core.Models.HTLCModels;
+﻿namespace Train.Solver.Core.Models;
 
 public class HTLCBlockEventResponse
 {
diff --git a/csharp/src/Core/Models/HTLCCommitEventMessage.cs b/csharp/src/Core/Models/HTLCCommitEventMessage.cs
@@ -1,6 +1,6 @@
 ﻿using Train.Solver.Core.Entities;
 
-namespace Train.Solver.Core.Models.HTLCModels;
+namespace Train.Solver.Core.Models;
 
 public class HTLCCommitEventMessage
 {
diff --git a/csharp/src/Core/Models/HTLCCommitTransactionPrepareRequest.cs b/csharp/src/Core/Models/HTLCCommitTransactionPrepareRequest.cs
@@ -1,4 +1,4 @@
-﻿namespace Train.Solver.Core.Models.HTLCModels;
+﻿namespace Train.Solver.Core.Models;
 
 public class HTLCCommitTransactionPrepareRequest
 {
diff --git a/csharp/src/Core/Models/HTLCLockEventMessage.cs b/csharp/src/Core/Models/HTLCLockEventMessage.cs
@@ -1,4 +1,4 @@
-﻿namespace Train.Solver.Core.Models.HTLCModels;
+﻿namespace Train.Solver.Core.Models;
 
 public class HTLCLockEventMessage
 {
diff --git a/csharp/src/Core/Models/HTLCLockTransactionPrepareRequest.cs b/csharp/src/Core/Models/HTLCLockTransactionPrepareRequest.cs
@@ -1,4 +1,4 @@
-﻿namespace Train.Solver.Core.Models.HTLCModels;
+﻿namespace Train.Solver.Core.Models;
 
 public class HTLCLockTransactionPrepareRequest
 {
diff --git a/csharp/src/Core/Models/HTLCRedeemTransactionPrepareRequest.cs b/csharp/src/Core/Models/HTLCRedeemTransactionPrepareRequest.cs
@@ -1,4 +1,4 @@
-﻿namespace Train.Solver.Core.Models.HTLCModels;
+﻿namespace Train.Solver.Core.Models;
 
 public class HTLCRedeemTransactionPrepareRequest
 {
diff --git a/csharp/src/Core/Models/HTLCRefundTransactionPrepareRequest.cs b/csharp/src/Core/Models/HTLCRefundTransactionPrepareRequest.cs
@@ -1,4 +1,4 @@
-﻿namespace Train.Solver.Core.Models.HTLCModels;
+﻿namespace Train.Solver.Core.Models;
 
 public class HTLCRefundTransactionPrepareRequest
 {
diff --git a/csharp/src/WorkflowRunner.EVM/Activities/EVMBlockchainActivities.cs b/csharp/src/WorkflowRunner.EVM/Activities/EVMBlockchainActivities.cs
@@ -19,7 +19,6 @@
 using static Train.Solver.Blockchains.EVM.Helpers.EVMResilientNodeHelper;
 using Train.Solver.Core.Models;
 using Nethereum.RPC.Eth.Mappers;
-using Train.Solver.Core.Models.HTLCModels;
 using Train.Solver.Core.Services;
 using Temporalio.Activities;
 using Train.Solver.Blockchains.EVM.Models;
diff --git a/csharp/src/WorkflowRunner.EVM/Helpers/EVMTransactionBuilder.cs b/csharp/src/WorkflowRunner.EVM/Helpers/EVMTransactionBuilder.cs
@@ -9,7 +9,6 @@
 using Train.Solver.Core.Entities;
 using Train.Solver.Core.Extensions;
 using Train.Solver.Core.Models;
-using Train.Solver.Core.Models.HTLCModels;
 
 namespace Train.Solver.Blockchains.EVM.Helpers;
 
@@ -107,7 +106,7 @@ public static PrepareTransactionResponse BuildTransferTransaction(
 
     public static PrepareTransactionResponse BuildHTLCAddLockSigTransaction(Network network, string args)
     {
-        var request = JsonSerializer.Deserialize<HTLCAddLockSigTransactionPrepareRequest>(args);
+        var request = JsonSerializer.Deserialize<AddLockSigTransactionPrepareRequest>(args);
 
         if (request is null)
         {
diff --git a/csharp/src/WorkflowRunner.EVM/Workflows/EVMTransactionProcessor.cs b/csharp/src/WorkflowRunner.EVM/Workflows/EVMTransactionProcessor.cs
@@ -6,7 +6,6 @@
 using Train.Solver.Core.Entities;
 using Train.Solver.Core.Exceptions;
 using Train.Solver.Core.Models;
-using Train.Solver.Core.Models.HTLCModels;
 using Train.Solver.Core.Workflows.Activities;
 using Train.Solver.Core.Workflows.Extensions;
 using Train.Solver.Core.Workflows.Helpers;
diff --git a/csharp/src/WorkflowRunner.Solana/Activities/SolanaBlockchainActivities.cs b/csharp/src/WorkflowRunner.Solana/Activities/SolanaBlockchainActivities.cs
@@ -11,7 +11,6 @@
 using Train.Solver.Core.Exceptions;
 using Train.Solver.Core.Extensions;
 using Train.Solver.Core.Models;
-using Train.Solver.Core.Models.HTLCModels;
 using static Train.Solver.Core.Workflows.Helpers.ResilientNodeHelper;
 using Nethereum.Web3;
 using Train.Solver.Core.Services;
diff --git a/csharp/src/WorkflowRunner.Solana/Helpers/EventDecoder.cs b/csharp/src/WorkflowRunner.Solana/Helpers/EventDecoder.cs
@@ -9,7 +9,7 @@
 using Train.Solver.Blockchains.Solana.Extensions;
 using Train.Solver.Blockchains.Solana.Models;
 using Train.Solver.Core.Entities;
-using Train.Solver.Core.Models.HTLCModels;
+using Train.Solver.Core.Models;
 
 namespace Train.Solver.Blockchains.Solana.Helpers;
 
diff --git a/csharp/src/WorkflowRunner.Solana/Helpers/SolanaTransactionBuilder.cs b/csharp/src/WorkflowRunner.Solana/Helpers/SolanaTransactionBuilder.cs
@@ -14,7 +14,6 @@
 using Train.Solver.Blockchains.Solana.Programs.Models;
 using Train.Solver.Core.Entities;
 using Train.Solver.Core.Models;
-using Train.Solver.Core.Models.HTLCModels;
 
 namespace Train.Solver.Blockchains.Solana.Helpers;
 
diff --git a/csharp/src/WorkflowRunner.Starknet/Activities/StarknetBlockchainActivities.cs b/csharp/src/WorkflowRunner.Starknet/Activities/StarknetBlockchainActivities.cs
@@ -10,7 +10,6 @@
 using Train.Solver.Core.Exceptions;
 using Train.Solver.Core.Extensions;
 using Train.Solver.Core.Models;
-using Train.Solver.Core.Models.HTLCModels;
 using Nethereum.JsonRpc.Client;
 using Nethereum.Web3;
 using Train.Solver.Blockchains.Starknet.Models;
diff --git a/csharp/src/WorkflowRunner.Starknet/Workflows/StarknetTransactionProcessor.cs b/csharp/src/WorkflowRunner.Starknet/Workflows/StarknetTransactionProcessor.cs
@@ -6,7 +6,6 @@
 using Train.Solver.Core.Entities;
 using Train.Solver.Core.Exceptions;
 using Train.Solver.Core.Models;
-using Train.Solver.Core.Models.HTLCModels;
 using Train.Solver.Core.Workflows.Extensions;
 using Train.Solver.Core.Workflows.Helpers;
 using static Temporalio.Workflows.Workflow;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using Train.Solver.Core.Models;`
`2`		`-using Train.Solver.Core.Models.HTLCModels;`
`3`	`2`
`4`	`3`	`namespace Train.Solver.Core.Workflows.Activities;`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`		`-namespace Train.Solver.Core.Models.HTLCModels;`
	`1`	`+namespace Train.Solver.Core.Models;`
`2`	`2`
`3`		`-public class HTLCAddLockSigTransactionPrepareRequest`
	`3`	`+public class AddLockSigTransactionPrepareRequest`
`4`	`4`	`{`
`5`	`5`	`public string Id { get; set; } = null!;`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Train.Solver.Core.Models.HTLCModels;`
	`1`	`+namespace Train.Solver.Core.Models;`
`2`	`2`
`3`	`3`	`public class HTLCBlockEventResponse`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using Train.Solver.Core.Entities;`
`2`	`2`
`3`		`-namespace Train.Solver.Core.Models.HTLCModels;`
	`3`	`+namespace Train.Solver.Core.Models;`
`4`	`4`
`5`	`5`	`public class HTLCCommitEventMessage`
`6`	`6`	`{`