Update directory structure pending OpenZeppelin/cairo-contracts#350

ericglau · Jun 17, 2022 · 3b60db7 · 3b60db7
1 parent 959e9eb
commit 3b60db7
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 53 deletions.
diff --git a/packages/core-cairo/src/add-pausable.ts b/packages/core-cairo/src/add-pausable.ts
@@ -20,7 +20,7 @@ export function addPausable(c: ContractBuilder, access: Access, pausableFns: Bas
 
 const modules = defineModules( {
   Pausable: {
-    path: 'openzeppelin/security/pausable', 
+    path: 'openzeppelin.security.library.Pausable', 
     usePrefix: true
   },
 });

diff --git a/packages/core-cairo/src/erc20.test.ts.md b/packages/core-cairo/src/erc20.test.ts.md
@@ -16,7 +16,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.uint256 import Uint256␊
     from starkware.cairo.common.bool import TRUE␊
     ␊
-    from openzeppelin.token.erc20.library import ERC20␊
+    from openzeppelin.token.erc20.library.ERC20 import ERC20␊
     ␊
     @constructor␊
     func constructor{␊
@@ -160,7 +160,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.bool import TRUE␊
     from starkware.starknet.common.syscalls import get_caller_address␊
     ␊
-    from openzeppelin.token.erc20.library import ERC20␊
+    from openzeppelin.token.erc20.library.ERC20 import ERC20␊
     ␊
     @constructor␊
     func constructor{␊
@@ -314,9 +314,9 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.uint256 import Uint256␊
     from starkware.cairo.common.bool import TRUE␊
     ␊
-    from openzeppelin.token.erc20.library import ERC20␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.token.erc20.library.ERC20 import ERC20␊
+    from openzeppelin.security.library.Pausable import Pausable␊
+    from openzeppelin.access.library.Ownable import Ownable␊
     ␊
     @constructor␊
     func constructor{␊
@@ -518,9 +518,9 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.bool import TRUE␊
     from starkware.starknet.common.syscalls import get_caller_address␊
     ␊
-    from openzeppelin.token.erc20.library import ERC20␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.token.erc20.library.ERC20 import ERC20␊
+    from openzeppelin.security.library.Pausable import Pausable␊
+    from openzeppelin.access.library.Ownable import Ownable␊
     ␊
     @constructor␊
     func constructor{␊
@@ -733,7 +733,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.uint256 import Uint256␊
     from starkware.cairo.common.bool import TRUE␊
     ␊
-    from openzeppelin.token.erc20.library import ERC20␊
+    from openzeppelin.token.erc20.library.ERC20 import ERC20␊
     ␊
     @constructor␊
     func constructor{␊
@@ -878,7 +878,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.uint256 import Uint256␊
     from starkware.cairo.common.bool import TRUE␊
     ␊
-    from openzeppelin.token.erc20.library import ERC20␊
+    from openzeppelin.token.erc20.library.ERC20 import ERC20␊
     ␊
     @constructor␊
     func constructor{␊
@@ -1021,8 +1021,8 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.uint256 import Uint256␊
     from starkware.cairo.common.bool import TRUE␊
     ␊
-    from openzeppelin.token.erc20.library import ERC20␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.token.erc20.library.ERC20 import ERC20␊
+    from openzeppelin.access.library.Ownable import Ownable␊
     ␊
     @constructor␊
     func constructor{␊
@@ -1198,10 +1198,10 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.bool import TRUE␊
     from starkware.starknet.common.syscalls import get_caller_address␊
     ␊
-    from openzeppelin.token.erc20.library import ERC20␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.ownable import Ownable␊
-    from openzeppelin.upgrades.library import Proxy␊
+    from openzeppelin.token.erc20.library.ERC20 import ERC20␊
+    from openzeppelin.security.library.Pausable import Pausable␊
+    from openzeppelin.access.library.Ownable import Ownable␊
+    from openzeppelin.upgrades.library.Proxy import Proxy␊
     ␊
     @external␊
     func initializer{␊
@@ -1439,7 +1439,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.uint256 import Uint256␊
     from starkware.cairo.common.bool import TRUE␊
     ␊
-    from openzeppelin.token.erc20.library import ERC20␊
+    from openzeppelin.token.erc20.library.ERC20 import ERC20␊
     ␊
     @constructor␊
     func constructor{␊
@@ -1582,7 +1582,7 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.uint256 import Uint256␊
     from starkware.cairo.common.bool import TRUE␊
     ␊
-    from openzeppelin.token.erc20.library import ERC20␊
+    from openzeppelin.token.erc20.library.ERC20 import ERC20␊
     ␊
     @constructor␊
     func constructor{␊
@@ -1726,10 +1726,10 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.bool import TRUE␊
     from starkware.starknet.common.syscalls import get_caller_address␊
     ␊
-    from openzeppelin.token.erc20.library import ERC20␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.ownable import Ownable␊
-    from openzeppelin.upgrades.library import Proxy␊
+    from openzeppelin.token.erc20.library.ERC20 import ERC20␊
+    from openzeppelin.security.library.Pausable import Pausable␊
+    from openzeppelin.access.library.Ownable import Ownable␊
+    from openzeppelin.upgrades.library.Proxy import Proxy␊
     ␊
     @external␊
     func initializer{␊

diff --git a/packages/core-cairo/src/erc20.test.ts.snap b/packages/core-cairo/src/erc20.test.ts.snap
diff --git a/packages/core-cairo/src/erc20.ts b/packages/core-cairo/src/erc20.ts
@@ -219,7 +219,7 @@ function addMintable(c: ContractBuilder, access: Access) {
 
 const modules = defineModules( {
   ERC20: {
-    path: 'openzeppelin/token/erc20/library',
+    path: 'openzeppelin.token.erc20.library.ERC20',
     usePrefix: true
   },
 

diff --git a/packages/core-cairo/src/erc721.test.ts.md b/packages/core-cairo/src/erc721.test.ts.md
@@ -15,8 +15,8 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import ERC721␊
-    from openzeppelin.introspection.ERC165 import ERC165␊
+    from openzeppelin.token.erc721.library.ERC721 import ERC721␊
+    from openzeppelin.introspection.library.ERC165 import ERC165␊
     ␊
     @constructor␊
     func constructor{␊
@@ -168,8 +168,8 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import ERC721␊
-    from openzeppelin.introspection.ERC165 import ERC165␊
+    from openzeppelin.token.erc721.library.ERC721 import ERC721␊
+    from openzeppelin.introspection.library.ERC165 import ERC165␊
     ␊
     @constructor␊
     func constructor{␊
@@ -332,10 +332,10 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import ERC721␊
-    from openzeppelin.introspection.ERC165 import ERC165␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.token.erc721.library.ERC721 import ERC721␊
+    from openzeppelin.introspection.library.ERC165 import ERC165␊
+    from openzeppelin.security.library.Pausable import Pausable␊
+    from openzeppelin.access.library.Ownable import Ownable␊
     ␊
     @constructor␊
     func constructor{␊
@@ -544,9 +544,9 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import ERC721␊
-    from openzeppelin.introspection.ERC165 import ERC165␊
-    from openzeppelin.access.ownable import Ownable␊
+    from openzeppelin.token.erc721.library.ERC721 import ERC721␊
+    from openzeppelin.introspection.library.ERC165 import ERC165␊
+    from openzeppelin.access.library.Ownable import Ownable␊
     ␊
     @constructor␊
     func constructor{␊
@@ -731,11 +731,11 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import ERC721␊
-    from openzeppelin.introspection.ERC165 import ERC165␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.ownable import Ownable␊
-    from openzeppelin.upgrades.library import Proxy␊
+    from openzeppelin.token.erc721.library.ERC721 import ERC721␊
+    from openzeppelin.introspection.library.ERC165 import ERC165␊
+    from openzeppelin.security.library.Pausable import Pausable␊
+    from openzeppelin.access.library.Ownable import Ownable␊
+    from openzeppelin.upgrades.library.Proxy import Proxy␊
     ␊
     @external␊
     func initializer{␊
@@ -981,8 +981,8 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import ERC721␊
-    from openzeppelin.introspection.ERC165 import ERC165␊
+    from openzeppelin.token.erc721.library.ERC721 import ERC721␊
+    from openzeppelin.introspection.library.ERC165 import ERC165␊
     ␊
     @constructor␊
     func constructor{␊
@@ -1134,8 +1134,8 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import ERC721␊
-    from openzeppelin.introspection.ERC165 import ERC165␊
+    from openzeppelin.token.erc721.library.ERC721 import ERC721␊
+    from openzeppelin.introspection.library.ERC165 import ERC165␊
     ␊
     @constructor␊
     func constructor{␊
@@ -1287,11 +1287,11 @@ Generated by [AVA](https://avajs.dev).
     from starkware.cairo.common.cairo_builtins import HashBuiltin␊
     from starkware.cairo.common.uint256 import Uint256␊
     ␊
-    from openzeppelin.token.erc721.library import ERC721␊
-    from openzeppelin.introspection.ERC165 import ERC165␊
-    from openzeppelin.security.pausable import Pausable␊
-    from openzeppelin.access.ownable import Ownable␊
-    from openzeppelin.upgrades.library import Proxy␊
+    from openzeppelin.token.erc721.library.ERC721 import ERC721␊
+    from openzeppelin.introspection.library.ERC165 import ERC165␊
+    from openzeppelin.security.library.Pausable import Pausable␊
+    from openzeppelin.access.library.Ownable import Ownable␊
+    from openzeppelin.upgrades.library.Proxy import Proxy␊
     ␊
     @external␊
     func initializer{␊

diff --git a/packages/core-cairo/src/erc721.test.ts.snap b/packages/core-cairo/src/erc721.test.ts.snap
diff --git a/packages/core-cairo/src/erc721.ts b/packages/core-cairo/src/erc721.ts
@@ -130,12 +130,12 @@ function addMintable(c: ContractBuilder, access: Access) {
 
 const modules = defineModules( {
   ERC165: {
-    path: 'openzeppelin.introspection.ERC165',
+    path: 'openzeppelin.introspection.library.ERC165',
     usePrefix: true
   },
 
   ERC721: {
-    path: 'openzeppelin/token/erc721/library',
+    path: 'openzeppelin.token.erc721.library.ERC721',
     usePrefix: true
   },
 })

diff --git a/packages/core-cairo/src/set-access-control.ts b/packages/core-cairo/src/set-access-control.ts
@@ -25,7 +25,7 @@ export function setAccessControl(c: ContractBuilder, fn: BaseFunction, access: A
 
 const modules = defineModules( {
   Ownable: {
-    path: 'openzeppelin/access/ownable',
+    path: 'openzeppelin.access.library.Ownable',
     usePrefix: true
   },
 })

diff --git a/packages/core-cairo/src/set-upgradeable.ts b/packages/core-cairo/src/set-upgradeable.ts
@@ -28,7 +28,7 @@ export function setUpgradeable(c: ContractBuilder, upgradeable: Upgradeable) {
 
 const modules = defineModules( {
   Proxy: {
-    path: 'openzeppelin/upgrades/library',
+    path: 'openzeppelin.upgrades.library.Proxy',
     usePrefix: true
   },
 });