Fix modifiers order to follow Solidity style guides (#450)

Co-authored-by: Eric Lau <[email protected]>

Author: GianfrancoBazzani

README.md

@@ -12,7 +12,9 @@ Contracts Wizard is a web application to interactively build a contract out of c
 
 Install dependencies with `yarn install`.
 
-`packages/core` contains the code generation logic for each language under separately named subfolders.
+`packages/core` contains the code generation logic for each language under separately named subfolders. From each language's subfolder:
+- Run `yarn test` to run the tests.
+- Run `yarn test:update-snapshots` to update AVA snapshots and run the tests.
 
 `packages/ui` is the interface built in Svelte. From the `packages/ui` directory, run `yarn dev` to spin up a local server to develop the UI.
 

packages/core/cairo/package.json

@@ -18,6 +18,7 @@
     "update_scarb_project": "ts-node src/scripts/update-scarb-project.ts",
     "prepublish": "rimraf dist *.tsbuildinfo",
     "test": "ava",
+    "test:update-snapshots": "ava --update-snapshots",
     "test:watch": "ava --watch",
     "version": "node ../../../scripts/bump-changelog.js"
   },

packages/core/solidity/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+- Fix modifiers order to follow Solidity style guides. ([#450](https://github.com/OpenZeppelin/contracts-wizard/pull/450))
+
 ## 0.5.1 (2025-02-05)
 
 - **Potentially breaking changes**:

packages/core/solidity/package.json

@@ -17,6 +17,7 @@
     "prepare": "tsc && node dist/scripts/prepare.js",
     "prepublish": "rimraf dist *.tsbuildinfo && hardhat clean",
     "test": "ava",
+    "test:update-snapshots": "ava --update-snapshots",
     "test:watch": "ava --watch",
     "version": "node ../../../scripts/bump-changelog.js",
     "update-env": "rm ./src/environments/hardhat/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat && rm ./src/environments/hardhat/upgradeable/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat/upgradeable"

packages/core/solidity/src/contract.test.ts.md

@@ -154,7 +154,7 @@ Generated by [AVA](https://avajs.dev).
     pragma solidity ^0.8.22;␊
     ␊
     contract Foo {␊
-        function _otherFunction() internal whenNotPaused override(ERC20, OtherParent) {␊
+        function _otherFunction() internal override(ERC20, OtherParent) whenNotPaused {␊
             super._otherFunction();␊
         }␊
     }␊

packages/core/solidity/src/contract.test.ts.snap

@@ -76,15 +76,15 @@ Generated by [AVA](https://avajs.dev).
             _disableInitializers();␊
         }␊
     ␊
-        function initialize(address initialOwner) initializer public {␊
+        function initialize(address initialOwner) public initializer {␊
             __Ownable_init(initialOwner);␊
             __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
             internal␊
-            onlyOwner␊
             override␊
+            onlyOwner␊
         {}␊
     }␊
     `
@@ -166,15 +166,15 @@ Generated by [AVA](https://avajs.dev).
             _disableInitializers();␊
         }␊
     ␊
-        function initialize(address initialOwner) initializer public {␊
+        function initialize(address initialOwner) public initializer {␊
             __Ownable_init(initialOwner);␊
             __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
             internal␊
-            onlyOwner␊
             override␊
+            onlyOwner␊
         {}␊
     }␊
     `

packages/core/solidity/src/custom.test.ts.md

@@ -354,7 +354,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         function initialize(address defaultAdmin, address pauser, address minter)␊
-            initializer public␊
+            public initializer␊
         {␊
             __ERC1155_init("https://gateway.pinata.cloud/ipfs/QmcP9hxrnC1T5ATPmq2saFeAM1ypFX9BnAswCdHB9JCjLA/");␊
             __AccessControl_init();␊
@@ -439,7 +439,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         function initialize(address defaultAdmin, address pauser, address minter, address upgrader)␊
-            initializer public␊
+            public initializer␊
         {␊
             __ERC1155_init("https://gateway.pinata.cloud/ipfs/QmcP9hxrnC1T5ATPmq2saFeAM1ypFX9BnAswCdHB9JCjLA/");␊
             __AccessControl_init();␊
@@ -481,8 +481,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function _authorizeUpgrade(address newImplementation)␊
             internal␊
-            onlyRole(UPGRADER_ROLE)␊
             override␊
+            onlyRole(UPGRADER_ROLE)␊
         {}␊
     ␊
         // The following functions are overrides required by Solidity.␊
@@ -526,7 +526,7 @@ Generated by [AVA](https://avajs.dev).
             _disableInitializers();␊
         }␊
     ␊
-        function initialize(address initialAuthority) initializer public {␊
+        function initialize(address initialAuthority) public initializer {␊
             __ERC1155_init("https://gateway.pinata.cloud/ipfs/QmcP9hxrnC1T5ATPmq2saFeAM1ypFX9BnAswCdHB9JCjLA/");␊
             __AccessManaged_init(initialAuthority);␊
             __ERC1155Pausable_init();␊
@@ -562,8 +562,8 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function _authorizeUpgrade(address newImplementation)␊
             internal␊
-            restricted␊
             override␊
+            restricted␊
         {}␊
     ␊
         // The following functions are overrides required by Solidity.␊