Refactor: use of TNotifyManyEvent in TWalleyKeys

Units/Forms/UFRMOperation.pas

@@ -146,7 +146,6 @@ type
     FEncodedPayload : TRawBytes;
     FDisabled : Boolean;
     FSenderAccounts: TOrderedCardinalList; // TODO: TOrderedCardinalList should be replaced with a "TCardinalList" since signer account should be processed last
-    FOldOnChanged : TNotifyEvent;
     procedure SetWalletKeys(const Value: TWalletKeys);
     Procedure UpdateWalletKeys;
     { Private declarations }
@@ -546,7 +545,7 @@ end;
 
 procedure TFRMOperation.FormDestroy(Sender: TObject);
 begin
-  if Assigned(FWalletKeys) then FWalletKeys.OnChanged := FOldOnChanged;
+  if Assigned(FWalletKeys) then FWalletKeys.OnChanged.Remove(OnWalletKeysChanged);
   FreeAndNil(FSenderAccounts);
 end;
 
@@ -621,7 +620,7 @@ end;
 procedure TFRMOperation.OnWalletKeysChanged(Sender: TObject);
 begin
   PostMessage(Self.Handle,CM_PC_WalletKeysChanged,0,0);
-  if Assigned(FOldOnChanged) then FOldOnChanged(Sender);
+  //if Assigned(FOldOnChanged) then FOldOnChanged(Sender);  // XXXXXXXX HS 2017-08-07 is this procedure needed anymore?
 end;
 
 procedure TFRMOperation.PageControlOpTypeChange(Sender: TObject);
@@ -668,11 +667,10 @@ procedure TFRMOperation.SetWalletKeys(const Value: TWalletKeys);
 begin
   Try
     if FWalletKeys=Value then exit;
-    if Assigned(FWalletKeys) then FWalletKeys.OnChanged := FOldOnChanged;
+    if Assigned(FWalletKeys) then FWalletKeys.OnChanged.Remove(OnWalletKeysChanged);
     FWalletKeys := Value;
     if Assigned(FWalletKeys) then begin
-      FOldOnChanged := FWalletKeys.OnChanged;
-      FWalletKeys.OnChanged := OnWalletKeysChanged;
+      FWalletKeys.OnChanged.Add(OnWalletKeysChanged);
     end;
   Finally
     UpdateWalletKeys;

Units/Forms/UFRMWallet.pas

@@ -31,7 +31,7 @@ uses
   Dialogs, ExtCtrls, ComCtrls, UWalletKeys, StdCtrls,
   ULog, Grids, UAppParams,
   UBlockChain, UNode, UGridUtils, UAccounts, Menus, ImgList,
-  UNetProtocol, UCrypto, Buttons, UPoolMining, URPC, UFRMAccountSelect;
+  UNetProtocol, UCrypto, Buttons, UPoolMining, URPC, UFRMAccountSelect, UCommon;
 
 Const
   CM_PC_WalletKeysChanged = WM_USER + 1;
@@ -358,7 +358,6 @@ begin
     // Init Grid
     //FAccountsGrid.Node := FNode;
     FSelectedAccountsGrid.Node := FNode;
-    FWalletKeys.OnChanged := OnWalletChanged;
     FAccountsGrid.Node := FNode;
     FOperationsAccountGrid.Node := FNode;
     // Reading database
@@ -880,7 +879,7 @@ begin
   FOperationsExplorerGrid.PendingOperations := False;
   FBlockChainGrid := TBlockChainGrid.Create(Self);
   FBlockChainGrid.DrawGrid := dgBlockChainExplorer;
-  FWalletKeys.OnChanged := OnWalletChanged;
+  FWalletKeys.OnChanged.Add(OnWalletChanged);
   LoadAppParams;
   UpdatePrivateKeys;
   UpdateBlockChainState;
@@ -979,6 +978,7 @@ begin
   Sleep(100);
 end;
 
+
 procedure TFRMWallet.sbSearchAccountClick(Sender: TObject);
 Var F : TFRMAccountSelect;
 begin

Units/Forms/UFRMWalletKeys.pas

@@ -23,7 +23,7 @@ uses
   Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, StdCtrls, UWalletKeys, Buttons,
   {$IFDEF FPC}LMessages,{$ENDIF}
-  clipbrd, UConst;
+  clipbrd, UConst, UCommon;
 
 Const
   CM_PC_WalletKeysChanged = {$IFDEF FPC}LM_USER{$ELSE}WM_USER{$ENDIF} + 1;
@@ -66,7 +66,7 @@ type
     procedure bbImportKeysFileClick(Sender: TObject);
     procedure bbLockClick(Sender: TObject);
   private
-    FOldOnChanged : TNotifyEvent;
+    //FOldOnChanged : TNotifyEvent;
     FWalletKeys: TWalletKeys;
     procedure SetWalletKeys(const Value: TWalletKeys);
     procedure OnWalletKeysChanged(Sender : TObject);
@@ -437,7 +437,7 @@ end;
 
 destructor TFRMWalletKeys.Destroy;
 begin
-  if Assigned(FWalletKeys) then FWalletKeys.OnChanged := FOldOnChanged;
+  if Assigned(FWalletKeys) then FWalletKeys.OnChanged.Remove(OnWalletKeysChanged);
   inherited;
 end;
 
@@ -475,17 +475,16 @@ end;
 procedure TFRMWalletKeys.OnWalletKeysChanged(Sender : TObject);
 begin
   PostMessage(Self.Handle,CM_PC_WalletKeysChanged,0,0);
-  if Assigned(FOldOnChanged) then FOldOnChanged(Sender);
+  //if Assigned(FOldOnChanged) then FOldOnChanged(Sender);   XXXXX HS 2017-09-07: is this procedure needed anymore?
 end;
 
 procedure TFRMWalletKeys.SetWalletKeys(const Value: TWalletKeys);
 begin
   if FWalletKeys=Value then exit;
-  if Assigned(FWalletKeys) then FWalletKeys.OnChanged := FOldOnChanged;
+  if Assigned(FWalletKeys) then FWalletKeys.OnChanged.Remove(OnWalletKeysChanged);
   FWalletKeys := Value;
   if Assigned(FWalletKeys) then begin
-    FOldOnChanged := FWalletKeys.OnChanged;
-    FWalletKeys.OnChanged := OnWalletKeysChanged;
+    FWalletKeys.OnChanged.Add(OnWalletKeysChanged);
   end;
   UpdateWalletKeys;
 end;

Units/PascalCoin/UWalletKeys.pas

@@ -20,7 +20,7 @@ unit UWalletKeys;
 interface
 
 uses
-  Classes, UBlockChain, UAccounts, UCrypto;
+  Classes, UBlockChain, UAccounts, UCrypto, UCommon;
 
 Type
   TWalletKey = Record
@@ -40,7 +40,7 @@ Type
     FIsValidPassword: Boolean;
     FWalletFileName: AnsiString;
     FIsReadingStream : Boolean;
-    FOnChanged: TNotifyEvent;
+    FOnChanged: TNotifyManyEvent;
     function GetKey(index: Integer): TWalletKey;
     procedure SetWalletPassword(const Value: AnsiString);
     Procedure GeneratePrivateKeysFromPassword;
@@ -61,7 +61,7 @@ Type
     Procedure Clear; virtual;
     Function Count : Integer;
     Property WalletFileName : AnsiString read FWalletFileName write SetWalletFileName;
-    Property OnChanged : TNotifyEvent read FOnChanged write FOnChanged;
+    Property OnChanged : TNotifyManyEvent read FOnChanged write FOnChanged;
     Procedure SetName(index : Integer; Const newName : AnsiString);
     Function LockWallet : Boolean;
   End;
@@ -119,7 +119,7 @@ begin
     P^.Name := Name;
   end;
   if Not FIsReadingStream then SaveToStream(FWalletFileStream);
-  if Assigned(FOnChanged) then  FOnChanged(Self);
+  FOnChanged.Invoke(Self);
 end;
 
 function TWalletKeys.AddPublicKey(const Name: AnsiString; ECDSA_Public: TECDSA_Public): Integer;
@@ -139,7 +139,7 @@ begin
     P^.Name := Name;
   end;
   if Not FIsReadingStream then SaveToStream(FWalletFileStream);
-  if Assigned(FOnChanged) then  FOnChanged(Self);
+  FOnChanged.Invoke(Self);
 end;
 
 procedure TWalletKeys.Clear;
@@ -179,7 +179,7 @@ begin
   Dispose(P);
   FSearchableKeys.Delete(index);
   SaveToStream(FWalletFileStream);
-  if Assigned(FOnChanged) then FOnChanged(Self);
+  FOnChanged.Invoke(Self);
 end;
 
 destructor TWalletKeys.destroy;
@@ -299,7 +299,7 @@ begin
   finally
     FIsReadingStream := false;
   end;
-  if Assigned(FOnChanged) then FOnChanged(Self);
+  FOnChanged.Invoke(Self);
 end;
 
 function TWalletKeys.LockWallet: Boolean;
@@ -308,7 +308,7 @@ begin
   FWalletPassword := '';
   GeneratePrivateKeysFromPassword;
   Result := Not IsValidPassword;
-  if Assigned(FOnChanged) then FOnChanged(Self);
+  FOnChanged.Invoke(Self);
 end;
 
 procedure TWalletKeys.SaveToStream(Stream: TStream);
@@ -339,7 +339,7 @@ begin
   if PWalletKey(FSearchableKeys[index])^.Name=newName then exit;
   PWalletKey(FSearchableKeys[index])^.Name := newName;
   SaveToStream(FWalletFileStream);
-  if Assigned(FOnChanged) then  FOnChanged(Self);
+  FOnChanged.Invoke(Self);
 end;
 
 procedure TWalletKeys.SetWalletFileName(const Value: AnsiString);
@@ -378,7 +378,7 @@ begin
   // Try if password is Ok
   GeneratePrivateKeysFromPassword;
   if FIsValidPassword then SaveToStream(FWalletFileStream);
-  if Assigned(FOnChanged) then FOnChanged(Self);
+  FOnChanged.Invoke(Self);
 end;
 
 { TWalletKeysExt }