Merge pull request #9 from aeternity/fix-reorder-meta_info-fields

Fix reorder meta info fields
aeternity · Aug 13, 2022 · 3f7d85c · 3f7d85c
2 parents 90c68a6 + b939d2a
commit 3f7d85c
Show file tree

Hide file tree

Showing 11 changed files with 128 additions and 111 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,17 @@
+name: aeproject
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+      - name: Use Node.js 16.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 16.x
+      - run: npm ci
+      - run: npx aeproject env --compilerVersion v6.1.0 --nodeVersion v6.5.2 && sleep 3
+      - run: npx aeproject test
diff --git a/contracts/base_nft.aes b/contracts/base_nft.aes
@@ -55,8 +55,8 @@ contract BaseNFT =
     record meta_info = 
         { name: string
         , symbol: string
-        , metadata_type : metadata_type 
-        , base_url: option(string) }
+        , base_url: option(string)
+        , metadata_type : metadata_type }
 
     record state = 
         { owner: address
@@ -70,12 +70,12 @@ contract BaseNFT =
 
     // Constructor. During initialization the contract's meta data will
     // be set.
-    stateful entrypoint init(name: string, symbol: string, metadata_type: metadata_type, base_url: option(string)) = 
+    stateful entrypoint init(name: string, symbol: string, base_url: option(string), metadata_type: metadata_type) = 
         require(String.length(name) >= 1, "STRING_TOO_SHORT_NAME")
         require(String.length(symbol) >= 1, "STRING_TOO_SHORT_SYMBOL")
 
         { owner = Call.caller,
-          meta_info = { name = name, symbol = symbol, metadata_type = metadata_type, base_url = base_url },
+          meta_info = { name = name, symbol = symbol, base_url = base_url, metadata_type = metadata_type },
           owners = {},
           balances = {},
           approvals = {},

diff --git a/contracts/core/interfaces.aes b/contracts/core/interfaces.aes
@@ -23,9 +23,9 @@ contract interface NFT =
 
     record meta_info = 
         { name: string
-        , symbol: string 
+        , symbol: string
         , base_url: option(string)
-        , metadata_type : metadata_type}
+        , metadata_type : metadata_type }
 
     // datatype event 
     //     = Transfer(address, address, int)

diff --git a/contracts/credential.aes b/contracts/credential.aes
@@ -56,8 +56,8 @@ contract CredentialNFT =
     record meta_info = 
         { name: string
         , symbol: string
-        , metadata_type : metadata_type 
-        , base_url: option(string) }
+        , base_url: option(string)
+        , metadata_type : metadata_type }
 
     record state = 
         { owner: address
@@ -76,7 +76,7 @@ contract CredentialNFT =
         require(String.length(symbol) >= 1, "STRING_TOO_SHORT_SYMBOL")
 
         { owner = Call.caller,
-          meta_info = { name = name, symbol = symbol, metadata_type = MAP, base_url = None },
+          meta_info = { name = name, symbol = symbol, base_url = None, metadata_type = MAP },
           owners = {},
           balances = {},
           approvals = {},

diff --git a/contracts/mintable_burnable.aes b/contracts/mintable_burnable.aes
@@ -55,8 +55,8 @@ contract MintableBurnableNFT =
     record meta_info = 
         { name: string
         , symbol: string
-        , metadata_type : metadata_type 
-        , base_url: option(string) }
+        , base_url: option(string)
+        , metadata_type : metadata_type }
 
     record state = 
         { owner: address
@@ -70,12 +70,12 @@ contract MintableBurnableNFT =
 
     // Constructor. During initialization the contract's meta data will
     // be set.
-    stateful entrypoint init(name: string, symbol: string, metadata_type: metadata_type, base_url: option(string)) = 
+    stateful entrypoint init(name: string, symbol: string, base_url: option(string), metadata_type: metadata_type) = 
         require(String.length(name) >= 1, "STRING_TOO_SHORT_NAME")
         require(String.length(symbol) >= 1, "STRING_TOO_SHORT_SYMBOL")
 
         { owner = Call.caller,
-          meta_info = { name = name, symbol = symbol, metadata_type = metadata_type, base_url = base_url },
+          meta_info = { name = name, symbol = symbol, base_url = base_url, metadata_type = metadata_type },
           owners = {},
           balances = {},
           approvals = {},

diff --git a/contracts/swappable.aes b/contracts/swappable.aes
@@ -56,8 +56,8 @@ contract SwappableNFT =
     record meta_info = 
         { name: string
         , symbol: string
-        , metadata_type : metadata_type 
-        , base_url: option(string) }
+        , base_url: option(string)
+        , metadata_type : metadata_type }
 
     record state = 
         { owner: address
@@ -72,12 +72,12 @@ contract SwappableNFT =
 
     // Constructor. During initialization the contract's meta data will
     // be set.
-    stateful entrypoint init(name: string, symbol: string, metadata_type: metadata_type, base_url: option(string)) = 
+    stateful entrypoint init(name: string, symbol: string, base_url: option(string), metadata_type: metadata_type) = 
         require(String.length(name) >= 1, "STRING_TOO_SHORT_NAME")
         require(String.length(symbol) >= 1, "STRING_TOO_SHORT_SYMBOL")
 
         { owner = Call.caller,
-          meta_info = { name = name, symbol = symbol, metadata_type = metadata_type, base_url = base_url },
+          meta_info = { name = name, symbol = symbol, base_url = base_url, metadata_type = metadata_type },
           owners = {},
           balances = {},
           approvals = {},