浏览代码

Add latests TAbstractMem library updates to core

Pascal Coin 3 年之前
父节点
当前提交
ea2fab718f
共有 3 个文件被更改,包括 8 次插入8 次删除
  1. 5 5
      src/core/UPCAbstractMem.pas
  2. 1 1
      src/core/UPCAbstractMemAccountKeys.pas
  3. 2 2
      src/core/UPCRPCFileUtils.pas

+ 5 - 5
src/core/UPCAbstractMem.pas

@@ -404,7 +404,7 @@ begin
   end;
   if (Not FAbstractMem.ReadOnly) and (AIsNewStructure) then begin
     // Initialize struct
-    FAbstractMem.ClearContent(FAbstractMem.Is64Bytes);
+    FAbstractMem.ClearContent(FAbstractMem.Is64Bits);
     LZone := FAbstractMem.New( CT_HEADER_MIN_SIZE );  // Header zone
     SetLength(LHeader,100);
     FillChar(LHeader[0],Length(LHeader),0);
@@ -413,9 +413,9 @@ begin
     Move(LBuffer[0],LHeader[0],14);
     w := CT_PCAbstractMem_FileVersion;
     Move(w,LHeader[14],2);
-    LZoneBlocks := FAbstractMem.New( CT_AbstractMemTList_HeaderSize );
-    LZoneAccounts := FAbstractMem.New( CT_AbstractMemTList_HeaderSize );
-    LZoneAccountsNames := FAbstractMem.New( CT_AbstractMemTList_HeaderSize );
+    LZoneBlocks := FAbstractMem.New( TAbstractMemTList.MinAbstractMemTListHeaderSize(FAbstractMem) );
+    LZoneAccounts := FAbstractMem.New( TAbstractMemTList.MinAbstractMemTListHeaderSize(FAbstractMem) );
+    LZoneAccountsNames := FAbstractMem.New( TAbstractMemTList.MinAbstractMemTListHeaderSize(FAbstractMem) );
     LZoneAccountKeys := FAbstractMem.New( 100 );
     FZoneAggregatedHashrate := FAbstractMem.New(100); // Note: Enough big to store a BigNum
     LZoneBuffersBlockHash := LZone.position+36;
@@ -482,7 +482,7 @@ var
   LIsNewStructure : Boolean;
 begin
   FlushCache;
-  FAbstractMem.ClearContent(FAbstractMem.Is64Bytes);
+  FAbstractMem.ClearContent(FAbstractMem.Is64Bits);
   DoInit(LIsNewStructure);
 end;
 

+ 1 - 1
src/core/UPCAbstractMemAccountKeys.pas

@@ -394,7 +394,7 @@ begin
     LZone.Clear;
     if (LNode.accounts_using_this_key_position=0) then begin
       // Create
-      LZone := FAbstractMem.New( CT_AbstractMemTList_HeaderSize );
+      LZone := FAbstractMem.New( TAbstractMemTList.MinAbstractMemTListHeaderSize(FAbstractMem) );
       LNode.accounts_using_this_key_position := LZone.position;
       LNode.WriteToMem( FAbstractMem ); // Save update:
     end else LZone.position := LNode.accounts_using_this_key_position;

+ 2 - 2
src/core/UPCRPCFileUtils.pas

@@ -68,7 +68,7 @@ begin
 {$IFDEF USE_ABSTRACTMEM}
   LFileName := AInputParams.AsString('filename', '').Trim;
   if (LFileName='') then begin
-    LFileName := TFileStorage.GetSafeboxCheckpointingFileName(TFileStorage(TNode.Node.Bank.Storage).DatabaseFolder,TNode.Node.Bank.BlocksCount);
+    LFileName := TPCBank.GetSafeboxCheckpointingFileName(TNode.Node.Bank.GetStorageFolder(''),TNode.Node.Bank.BlocksCount);
   end;
   TNode.Node.Bank.SafeBox.SaveCheckpointing(LFileName);
   AJSONResponse.GetAsObject('result').GetAsVariant('filename').Value := LFileName;
@@ -148,7 +148,7 @@ begin
 
   LFileName := AInputParams.AsString('filename', '').Trim;
   if (LFileName='') then begin
-    LFileName := TFileStorage.GetSafeboxCheckpointingFileName(TFileStorage(TNode.Node.Bank.Storage).DatabaseFolder,TNode.Node.Bank.BlocksCount);
+    LFileName := TPCBank.GetSafeboxCheckpointingFileName(TNode.Node.Bank.GetStorageFolder(''),TNode.Node.Bank.BlocksCount);
     LFileName := ChangeFileExt(LFileName,'.safebox');
   end;
   LFs := TFileStream.Create(LFileName,fmCreate);