Browse Source

Defined TRawBytes at UBaseTypes

TRawBytes where defined twice: At UBaseTypes and UCrypto. Now only at UBaseTypes
PascalCoin 6 years ago
parent
commit
cec339c2a5

+ 1 - 1
src/core.utils/UCoreObjects.pas

@@ -18,7 +18,7 @@ unit UCoreObjects;
 interface
 interface
 
 
 uses
 uses
-  Classes, SysUtils, UCrypto, UAccounts, UBlockChain, UWallet, UCommon,
+  Classes, SysUtils, UCrypto, UAccounts, UBlockChain, UWallet, UCommon, UBaseTypes,
   Generics.Collections, Generics.Defaults;
   Generics.Collections, Generics.Defaults;
 
 
 type
 type

+ 1 - 1
src/core/UAES.pas

@@ -32,7 +32,7 @@ unit UAES;
 interface
 interface
 
 
 uses
 uses
-  SysUtils, UCrypto;
+  SysUtils, UCrypto, UBaseTypes;
 
 
 Type
 Type
   TAESComp = Class
   TAESComp = Class

+ 2 - 2
src/core/UBlockChain.pas

@@ -23,7 +23,7 @@ unit UBlockChain;
 interface
 interface
 
 
 uses
 uses
-  Classes, UCrypto, UAccounts, ULog, UThread, SyncObjs;
+  Classes, UCrypto, UAccounts, ULog, UThread, SyncObjs, UBaseTypes;
 {$I config.inc}
 {$I config.inc}
 
 
 {
 {
@@ -497,7 +497,7 @@ implementation
 
 
 uses
 uses
   SysUtils, Variants,
   SysUtils, Variants,
-  UTime, UConst, UOpTransaction, UBaseTypes;
+  UTime, UConst, UOpTransaction;
 
 
 { TPCBank }
 { TPCBank }
 
 

+ 2 - 2
src/core/UCrypto.pas

@@ -25,12 +25,12 @@ unit UCrypto;
 interface
 interface
 
 
 uses
 uses
-  Classes, SysUtils, UOpenSSL, UOpenSSLdef, URandomHash;
+  Classes, SysUtils, UOpenSSL, UOpenSSLdef, URandomHash, UBaseTypes;
 
 
 Type
 Type
   ECryptoException = Class(Exception);
   ECryptoException = Class(Exception);
 
 
-  TRawBytes = AnsiString;
+  // TRawBytes = AnsiString; XXXXXXXX Definded at UBaseTypes
   PRawBytes = ^TRawBytes;
   PRawBytes = ^TRawBytes;
 
 
   TECDSA_SIG = record
   TECDSA_SIG = record

+ 1 - 1
src/core/UECIES.pas

@@ -43,7 +43,7 @@ unit UECIES;
 
 
 interface
 interface
 
 
-Uses UOpenSSLdef, UOpenSSL, UCrypto, ULog, UConst;
+Uses UOpenSSLdef, UOpenSSL, UCrypto, ULog, UConst, UBaseTypes;
 
 
 Const CT_Max_Bytes_To_Encrypt = 32000;
 Const CT_Max_Bytes_To_Encrypt = 32000;
 
 

+ 1 - 1
src/core/UNode.pas

@@ -34,7 +34,7 @@ unit UNode;
 interface
 interface
 
 
 uses
 uses
-  Classes, SysUtils, UBlockChain, UNetProtocol, UAccounts, UCrypto, UThread, SyncObjs, ULog;
+  Classes, SysUtils, UBlockChain, UNetProtocol, UAccounts, UCrypto, UThread, SyncObjs, ULog, UBaseTypes;
 
 
 {$I config.inc}
 {$I config.inc}
 
 

+ 1 - 1
src/core/UOpTransaction.pas

@@ -22,7 +22,7 @@ unit UOpTransaction;
 
 
 interface
 interface
 
 
-Uses UCrypto, UBlockChain, Classes, UAccounts;
+Uses UCrypto, UBlockChain, Classes, UAccounts, UBaseTypes;
 
 
 Type
 Type
   // Operations Type
   // Operations Type

+ 2 - 2
src/core/UPoolMining.pas

@@ -29,7 +29,7 @@ Uses
   {LCLIntf, LCLType, LMessages,}
   {LCLIntf, LCLType, LMessages,}
 {$ENDIF}
 {$ENDIF}
   UTCPIP, SysUtils, UThread, SyncObjs, Classes, UJSONFunctions, UAES, UNode,
   UTCPIP, SysUtils, UThread, SyncObjs, Classes, UJSONFunctions, UAES, UNode,
-  UCrypto, UAccounts, UConst, UBlockChain;
+  UCrypto, UAccounts, UConst, UBlockChain, UBaseTypes;
 
 
 {$I config.inc}
 {$I config.inc}
 
 
@@ -169,7 +169,7 @@ Const
 
 
 implementation
 implementation
 
 
-Uses ULog, Variants, UTime, UNetProtocol, UBaseTypes;
+Uses ULog, Variants, UTime, UNetProtocol;
 
 
 Type TPendingResponseMessage = Record
 Type TPendingResponseMessage = Record
        sendDateTime : TDateTime;
        sendDateTime : TDateTime;

+ 1 - 1
src/core/UTxMultiOperation.pas

@@ -23,7 +23,7 @@ unit UTxMultiOperation;
 interface
 interface
 
 
 uses
 uses
-  Classes, SysUtils, UCrypto, UBlockChain, UAccounts;
+  Classes, SysUtils, UCrypto, UBlockChain, UAccounts, UBaseTypes;
 
 
 Type
 Type
 
 

+ 2 - 1
src/gui-classic/UFRMOperation.pas

@@ -31,7 +31,8 @@ uses
 {$ENDIF}
 {$ENDIF}
   Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, StdCtrls, UNode, UWallet, UCrypto, Buttons, UBlockChain,
   Dialogs, StdCtrls, UNode, UWallet, UCrypto, Buttons, UBlockChain,
-  UAccounts, UFRMAccountSelect, ActnList, ComCtrls, Types, UFRMMemoText;
+  UAccounts, UFRMAccountSelect, ActnList, ComCtrls, Types, UFRMMemoText,
+  UBaseTypes;
 
 
 Const
 Const
   CM_PC_WalletKeysChanged = WM_USER + 1;
   CM_PC_WalletKeysChanged = WM_USER + 1;

+ 1 - 1
src/gui-classic/UFRMPayloadDecoder.pas

@@ -106,7 +106,7 @@ implementation
   {$R *.lfm}
   {$R *.lfm}
 {$ENDIF}
 {$ENDIF}
 
 
-Uses UNode, UTime, UECIES, UAES, UAccounts, UFRMMemoText;
+Uses UNode, UTime, UECIES, UAES, UAccounts, UFRMMemoText, UBaseTypes;
 
 
 { TFRMPayloadDecoder }
 { TFRMPayloadDecoder }
 
 

+ 2 - 2
src/gui-classic/UFRMWallet.pas

@@ -34,7 +34,7 @@ uses
   ExtCtrls, ComCtrls, UWallet, StdCtrls, ULog, Grids, UAppParams, UBlockChain,
   ExtCtrls, ComCtrls, UWallet, StdCtrls, ULog, Grids, UAppParams, UBlockChain,
   UNode, UGridUtils, UJSONFunctions, UAccounts, Menus, ImgList, UNetProtocol,
   UNode, UGridUtils, UJSONFunctions, UAccounts, Menus, ImgList, UNetProtocol,
   UCrypto, Buttons, UPoolMining, URPC, UFRMAccountSelect, UConst,
   UCrypto, Buttons, UPoolMining, URPC, UFRMAccountSelect, UConst,
-  UAccountKeyStorage,
+  UAccountKeyStorage, UBaseTypes,
   UFRMRPCCalls, UTxMultiOperation;
   UFRMRPCCalls, UTxMultiOperation;
 
 
 Const
 Const
@@ -315,7 +315,7 @@ implementation
 
 
 Uses UFolderHelper, UOpenSSL, UOpenSSLdef, UTime, UFileStorage,
 Uses UFolderHelper, UOpenSSL, UOpenSSLdef, UTime, UFileStorage,
   UThread, UOpTransaction, UECIES, UFRMPascalCoinWalletConfig,
   UThread, UOpTransaction, UECIES, UFRMPascalCoinWalletConfig,
-  UFRMOperationsExplorer, UBaseTypes,
+  UFRMOperationsExplorer,
   UFRMAbout, UFRMOperation, UFRMWalletKeys, UFRMPayloadDecoder, UFRMNodesIp, UFRMMemoText,
   UFRMAbout, UFRMOperation, UFRMWalletKeys, UFRMPayloadDecoder, UFRMNodesIp, UFRMMemoText,
   USettings, UCommon;
   USettings, UCommon;
 
 

+ 1 - 1
src/gui-classic/UGridUtils.pas

@@ -31,7 +31,7 @@ uses
   LCLIntf, LCLType, LMessages,
   LCLIntf, LCLType, LMessages,
 {$ENDIF}
 {$ENDIF}
   Classes, Grids, UNode, UAccounts, UBlockChain, UAppParams,
   Classes, Grids, UNode, UAccounts, UBlockChain, UAppParams,
-  UWallet, UCrypto, UPoolMining, URPC;
+  UWallet, UCrypto, UPoolMining, URPC, UBaseTypes;
 
 
 Type
 Type
   // TAccountsGrid implements a visual integration of TDrawGrid
   // TAccountsGrid implements a visual integration of TDrawGrid

+ 1 - 1
src/gui/UFRMMessages.pas

@@ -25,7 +25,7 @@ interface
 uses
 uses
   LCLIntf, LCLType,
   LCLIntf, LCLType,
   SysUtils, Classes, Graphics, Controls, Forms,
   SysUtils, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, Menus, UCommon.UI,
+  Dialogs, StdCtrls, Menus, UCommon.UI, UBaseTypes,
   UNode, UNetProtocol, UCrypto, UFRMMainForm,UConst;
   UNode, UNetProtocol, UCrypto, UFRMMainForm,UConst;
 
 
 type
 type

+ 1 - 1
src/gui/UFRMOperation.pas

@@ -26,7 +26,7 @@ uses
   LCLIntf, LCLType, LMessages,
   LCLIntf, LCLType, LMessages,
   Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, StdCtrls, UCommon.UI,
   Dialogs, StdCtrls, UCommon.UI,
-  UNode, UWallet, UCrypto, Buttons, UBlockChain,
+  UNode, UWallet, UCrypto, Buttons, UBlockChain, UBaseTypes,
   UAccounts, UFRMAccountSelect, ActnList, ComCtrls, Types, UCommon;
   UAccounts, UFRMAccountSelect, ActnList, ComCtrls, Types, UCommon;
 
 
 Const
 Const

+ 1 - 1
src/gui/UFRMPayloadDecoder.pas

@@ -96,7 +96,7 @@ implementation
 
 
 {$R *.lfm}
 {$R *.lfm}
 
 
-Uses UNode, UTime, UECIES, UAES, UAccounts, UCommon, UFRMMemoText, USettings;
+Uses UNode, UTime, UECIES, UAES, UAccounts, UCommon, UFRMMemoText, USettings, UBaseTypes;
 
 
 { TFRMPayloadDecoder }
 { TFRMPayloadDecoder }
 
 

+ 1 - 1
src/gui/UUserInterface.pas

@@ -27,7 +27,7 @@ uses
   Dialogs, LCLType,
   Dialogs, LCLType,
   UCommon, UCommon.UI,
   UCommon, UCommon.UI,
   UBlockChain, UAccounts, UNode, UWallet, UConst, UFolderHelper, UGridUtils, URPC, UPoolMining,
   UBlockChain, UAccounts, UNode, UWallet, UConst, UFolderHelper, UGridUtils, URPC, UPoolMining,
-  ULog, UThread, UNetProtocol, UCrypto,
+  ULog, UThread, UNetProtocol, UCrypto, UBaseTypes,
   UFRMMainForm, UCTRLSyncronization, UFRMAccountExplorer, UFRMOperationExplorer, UFRMPendingOperations, UFRMOperation,
   UFRMMainForm, UCTRLSyncronization, UFRMAccountExplorer, UFRMOperationExplorer, UFRMPendingOperations, UFRMOperation,
   UFRMLogs, UFRMMessages, UFRMNodes, UFRMBlockExplorer, UFRMWalletKeys;
   UFRMLogs, UFRMMessages, UFRMNodes, UFRMBlockExplorer, UFRMWalletKeys;