sync up namings

AngelProtocolFinance · Jul 25, 2023 · 61e74e7 · 61e74e7
1 parent 7fefe05
commit 61e74e7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/contracts/core/accounts/message.sol b/contracts/core/accounts/message.sol
@@ -90,7 +90,6 @@ library AccountMessages {
     address registrarContract;
     uint256 nextAccountId;
     uint256 maxGeneralCategoryId;
-    LibAccounts.FeeSetting earlyLockedWithdrawFee;
   }
 
   struct StateResponse {

diff --git a/contracts/core/accounts/storage.sol b/contracts/core/accounts/storage.sol
@@ -13,7 +13,6 @@ library AccountStorage {
     uint32 nextAccountId;
     uint256 maxGeneralCategoryId;
     bool reentrancyGuardLocked;
-    LibAccounts.FeeSetting earlyLockedWithdrawFee;
   }
 
   struct Endowment {

diff --git a/contracts/multisigs/CharityApplications.sol b/contracts/multisigs/CharityApplications.sol
@@ -107,11 +107,11 @@ contract CharityApplications is MultiSigGeneric, StorageApplications, ICharityAp
    * @notice propose a charity to be opened on Accounts
    * @dev propose a charity to be opened on Accounts
    * @param _application.Charity application
-   * @param _meta Meta (URL of Metadata)
+   * @param _metadata Metadata
    */
   function proposeApplication(
     AccountMessages.CreateEndowmentRequest memory _application,
-    bytes memory _meta
+    bytes memory _metadata
   ) public override {
     require(proposals[proposalCount].proposer == address(0), "Proposal already exists");
     require(
@@ -135,12 +135,12 @@ contract CharityApplications is MultiSigGeneric, StorageApplications, ICharityAp
     proposals[proposalCount] = ApplicationsStorage.ApplicationProposal({
       proposer: msg.sender,
       application: _application,
-      meta: _meta,
+      meta: _metadata,
       expiry: expiry,
       executed: false
     });
 
-    emit ApplicationProposed(proposalCount, msg.sender, _application.name, expiry, _meta);
+    emit ApplicationProposed(proposalCount, msg.sender, _application.name, expiry, _metadata);
 
     if (isOwner[msg.sender]) {
       confirmProposal(proposalCount);

diff --git a/contracts/multisigs/CharityApplicationsStorage.sol b/contracts/multisigs/CharityApplicationsStorage.sol
@@ -8,7 +8,7 @@ library ApplicationsStorage {
   struct ApplicationProposal {
     address proposer;
     AccountMessages.CreateEndowmentRequest application;
-    bytes meta;
+    bytes metadata;
     uint256 expiry;
     bool executed;
   }

diff --git a/contracts/multisigs/interfaces/ICharityApplications.sol b/contracts/multisigs/interfaces/ICharityApplications.sol
@@ -52,7 +52,7 @@ abstract contract ICharityApplications {
 
   function proposeApplication(
     AccountMessages.CreateEndowmentRequest memory application,
-    bytes memory meta
+    bytes memory metadata
   ) public virtual;
 
   function confirmProposal(uint256 proposalId) public virtual;