From 3ff22c9e16e8f554cbf7f2269e0e81ad526750d8 Mon Sep 17 00:00:00 2001 From: marc0olo Date: Sat, 13 Aug 2022 20:28:23 +0200 Subject: [PATCH 1/2] fix: reorder meta_info fields and align tests --- contracts/base_nft.aes | 8 +- contracts/core/interfaces.aes | 4 +- contracts/credential.aes | 6 +- contracts/mintable_burnable.aes | 8 +- contracts/swappable.aes | 8 +- package-lock.json | 140 ++++++++++++++++---------------- package.json | 2 +- test/MintableBurnableNFTTest.js | 18 ++-- test/SwappableNFTTest.js | 18 ++-- test/baseNFTTest.js | 10 +-- 10 files changed, 111 insertions(+), 111 deletions(-) diff --git a/contracts/base_nft.aes b/contracts/base_nft.aes index 878a65c..eb533f2 100644 --- 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 index 0105138..ee7405c 100644 --- 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 index 82499c3..02828cc 100644 --- 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 index 65e4f0d..674b669 100644 --- 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 index ad86971..e8ba67b 100644 --- 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 = {}, diff --git a/package-lock.json b/package-lock.json index 9493189..0240f6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "ae-nft", "version": "1.0.0", "dependencies": { - "@aeternity/aepp-sdk": "^12.1.1", + "@aeternity/aepp-sdk": "^12.1.2", "chai-as-promised": "^7.1.1" }, "devDependencies": { @@ -46,14 +46,14 @@ } }, "node_modules/@aeternity/aepp-sdk": { - "version": "12.1.1", - "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-12.1.1.tgz", - "integrity": "sha512-QUB/PoLjdiRYkPOHWT/z9LwTBfPkBYaM/4Mjbw0YNs1W16asL+d8E1XFZjJtMyCJNreooHd9IqPWWMV9GL7abw==", + "version": "12.1.2", + "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-12.1.2.tgz", + "integrity": "sha512-OlqQzjChsbvgPLCT2p5egjx+meFSnSeEfmwr1JmzhIIg9CaCOlTBgx6zLw88BNyWAwUSAYVcgIF73XvH1yUF3A==", "dependencies": { "@aeternity/aepp-calldata": "^1.2.0", "@aeternity/argon2-browser": "^0.1.2", "@aeternity/uuid": "^0.0.1", - "@azure/core-client": "^1.6.0", + "@azure/core-client": "1.6.0", "@azure/core-rest-pipeline": "^1.9.0", "@babel/runtime-corejs3": "^7.18.9", "@types/aes-js": "^3.1.1", @@ -121,9 +121,9 @@ } }, "node_modules/@azure/core-auth": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.3.2.tgz", - "integrity": "sha512-7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.4.0.tgz", + "integrity": "sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ==", "dependencies": { "@azure/abort-controller": "^1.0.0", "tslib": "^2.2.0" @@ -150,17 +150,17 @@ } }, "node_modules/@azure/core-rest-pipeline": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.9.0.tgz", - "integrity": "sha512-uvM3mY+Vegk0F2r4Eh0yPdsXTUyafTQkeX0USnz1Eyangxm2Bib0w0wkJVZW8fpks7Lcv0ztIdCFTrN7H8uptg==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.9.1.tgz", + "integrity": "sha512-OVtt0LP0K5ktsKTmh6/695P0mPFmngjdCJPr4V0uvrkhHTkARSQ3VYRnxRc0LC9g3mHcH90C+8a6iF7ApMAZKg==", "dependencies": { "@azure/abort-controller": "^1.0.0", - "@azure/core-auth": "^1.3.0", + "@azure/core-auth": "^1.4.0", "@azure/core-tracing": "^1.0.1", "@azure/core-util": "^1.0.0", "@azure/logger": "^1.0.0", "form-data": "^4.0.0", - "http-proxy-agent": "^4.0.1", + "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0", "tslib": "^2.2.0", "uuid": "^8.3.0" @@ -215,11 +215,11 @@ } }, "node_modules/@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "engines": { - "node": ">= 6" + "node": ">= 10" } }, "node_modules/@types/aes-js": { @@ -238,9 +238,9 @@ "integrity": "sha512-zpchZLNsNuzJHi6v64UBoFWAvQlPhch7XAi36FkH6tL1bbbmimIF+cS7vwkzY4u5RaSWMoflQfu+TshMPPw8uw==" }, "node_modules/@types/node": { - "version": "18.6.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.2.tgz", - "integrity": "sha512-KcfkBq9H4PI6Vpu5B/KoPeuVDAbmi+2mDBqGPGUgoL7yXQtcWGu2vJWmmRkneWK3Rh0nIAX192Aa87AqKHYChQ==" + "version": "18.7.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.3.tgz", + "integrity": "sha512-LJgzOEwWuMTBxHzgBR/fhhBOWrvBjvO+zPteUgbbuQi80rYIZHrk1mNbRUqPZqSLP2H7Rwt1EFLL/tNLD1Xx/w==" }, "node_modules/@types/sha.js": { "version": "2.4.0", @@ -396,9 +396,9 @@ ] }, "node_modules/bignumber.js": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.2.tgz", - "integrity": "sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz", + "integrity": "sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A==", "engines": { "node": "*" } @@ -652,9 +652,9 @@ "dev": true }, "node_modules/core-js-pure": { - "version": "3.24.0", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.24.0.tgz", - "integrity": "sha512-uzMmW8cRh7uYw4JQtzqvGWRyC2T5+4zipQLQdi2FmiRqP83k3d6F3stv2iAlNhOs6cXN401FCD5TL0vvleuHgA==", + "version": "3.24.1", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.24.1.tgz", + "integrity": "sha512-r1nJk41QLLPyozHUUPmILCEMtMw24NG4oWK6RbsDdjzQgg9ZvrUsPBj1MnG0wXXp1DCDU6j+wUvEmBSrtRbLXg==", "hasInstallScript": true, "funding": { "type": "opencollective", @@ -733,9 +733,9 @@ "dev": true }, "node_modules/es5-ext": { - "version": "0.10.61", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz", - "integrity": "sha512-yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA==", + "version": "0.10.62", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz", + "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==", "hasInstallScript": true, "dependencies": { "es6-iterator": "^2.0.3", @@ -803,9 +803,9 @@ } }, "node_modules/ext/node_modules/type": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz", - "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==" + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", + "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" }, "node_modules/fill-range": { "version": "7.0.1", @@ -986,11 +986,11 @@ } }, "node_modules/http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dependencies": { - "@tootallnate/once": "1", + "@tootallnate/once": "2", "agent-base": "6", "debug": "4" }, @@ -1844,14 +1844,14 @@ } }, "@aeternity/aepp-sdk": { - "version": "12.1.1", - "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-12.1.1.tgz", - "integrity": "sha512-QUB/PoLjdiRYkPOHWT/z9LwTBfPkBYaM/4Mjbw0YNs1W16asL+d8E1XFZjJtMyCJNreooHd9IqPWWMV9GL7abw==", + "version": "12.1.2", + "resolved": "https://registry.npmjs.org/@aeternity/aepp-sdk/-/aepp-sdk-12.1.2.tgz", + "integrity": "sha512-OlqQzjChsbvgPLCT2p5egjx+meFSnSeEfmwr1JmzhIIg9CaCOlTBgx6zLw88BNyWAwUSAYVcgIF73XvH1yUF3A==", "requires": { "@aeternity/aepp-calldata": "^1.2.0", "@aeternity/argon2-browser": "^0.1.2", "@aeternity/uuid": "^0.0.1", - "@azure/core-client": "^1.6.0", + "@azure/core-client": "1.6.0", "@azure/core-rest-pipeline": "^1.9.0", "@babel/runtime-corejs3": "^7.18.9", "@types/aes-js": "^3.1.1", @@ -1910,9 +1910,9 @@ } }, "@azure/core-auth": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.3.2.tgz", - "integrity": "sha512-7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.4.0.tgz", + "integrity": "sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ==", "requires": { "@azure/abort-controller": "^1.0.0", "tslib": "^2.2.0" @@ -1933,17 +1933,17 @@ } }, "@azure/core-rest-pipeline": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.9.0.tgz", - "integrity": "sha512-uvM3mY+Vegk0F2r4Eh0yPdsXTUyafTQkeX0USnz1Eyangxm2Bib0w0wkJVZW8fpks7Lcv0ztIdCFTrN7H8uptg==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.9.1.tgz", + "integrity": "sha512-OVtt0LP0K5ktsKTmh6/695P0mPFmngjdCJPr4V0uvrkhHTkARSQ3VYRnxRc0LC9g3mHcH90C+8a6iF7ApMAZKg==", "requires": { "@azure/abort-controller": "^1.0.0", - "@azure/core-auth": "^1.3.0", + "@azure/core-auth": "^1.4.0", "@azure/core-tracing": "^1.0.1", "@azure/core-util": "^1.0.0", "@azure/logger": "^1.0.0", "form-data": "^4.0.0", - "http-proxy-agent": "^4.0.1", + "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0", "tslib": "^2.2.0", "uuid": "^8.3.0" @@ -1983,9 +1983,9 @@ } }, "@tootallnate/once": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", - "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==" }, "@types/aes-js": { "version": "3.1.1", @@ -2003,9 +2003,9 @@ "integrity": "sha512-zpchZLNsNuzJHi6v64UBoFWAvQlPhch7XAi36FkH6tL1bbbmimIF+cS7vwkzY4u5RaSWMoflQfu+TshMPPw8uw==" }, "@types/node": { - "version": "18.6.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.6.2.tgz", - "integrity": "sha512-KcfkBq9H4PI6Vpu5B/KoPeuVDAbmi+2mDBqGPGUgoL7yXQtcWGu2vJWmmRkneWK3Rh0nIAX192Aa87AqKHYChQ==" + "version": "18.7.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.3.tgz", + "integrity": "sha512-LJgzOEwWuMTBxHzgBR/fhhBOWrvBjvO+zPteUgbbuQi80rYIZHrk1mNbRUqPZqSLP2H7Rwt1EFLL/tNLD1Xx/w==" }, "@types/sha.js": { "version": "2.4.0", @@ -2126,9 +2126,9 @@ "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, "bignumber.js": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.0.2.tgz", - "integrity": "sha512-GAcQvbpsM0pUb0zw1EI0KhQEZ+lRwR5fYaAp3vPOYuP7aDvGy6cVN6XHLauvF8SOga2y0dcLcjt3iQDTSEliyw==" + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.0.tgz", + "integrity": "sha512-4LwHK4nfDOraBCtst+wOWIHbu1vhvAPJK8g8nROd4iuc3PSEjWif/qwbkh8jwCJz6yDBvtU4KPynETgrfh7y3A==" }, "binary-extensions": { "version": "2.2.0", @@ -2313,9 +2313,9 @@ "dev": true }, "core-js-pure": { - "version": "3.24.0", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.24.0.tgz", - "integrity": "sha512-uzMmW8cRh7uYw4JQtzqvGWRyC2T5+4zipQLQdi2FmiRqP83k3d6F3stv2iAlNhOs6cXN401FCD5TL0vvleuHgA==" + "version": "3.24.1", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.24.1.tgz", + "integrity": "sha512-r1nJk41QLLPyozHUUPmILCEMtMw24NG4oWK6RbsDdjzQgg9ZvrUsPBj1MnG0wXXp1DCDU6j+wUvEmBSrtRbLXg==" }, "d": { "version": "1.0.1", @@ -2366,9 +2366,9 @@ "dev": true }, "es5-ext": { - "version": "0.10.61", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz", - "integrity": "sha512-yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA==", + "version": "0.10.62", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz", + "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==", "requires": { "es6-iterator": "^2.0.3", "es6-symbol": "^3.1.3", @@ -2420,9 +2420,9 @@ }, "dependencies": { "type": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz", - "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==" + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", + "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==" } } }, @@ -2544,11 +2544,11 @@ "dev": true }, "http-proxy-agent": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", - "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "requires": { - "@tootallnate/once": "1", + "@tootallnate/once": "2", "agent-base": "6", "debug": "4" } diff --git a/package.json b/package.json index d727a99..98beab6 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "test": "mocha ./test/**/*.js --timeout 0 --exit" }, "dependencies": { - "@aeternity/aepp-sdk": "^12.1.1", + "@aeternity/aepp-sdk": "^12.1.2", "chai-as-promised": "^7.1.1" }, "devDependencies": { diff --git a/test/MintableBurnableNFTTest.js b/test/MintableBurnableNFTTest.js index 347c6a7..ce7d571 100644 --- a/test/MintableBurnableNFTTest.js +++ b/test/MintableBurnableNFTTest.js @@ -29,10 +29,10 @@ describe('mintable, burnable nft', () => { // initialize the contract instance contract = await aeSdk.getContractInstance({ source, fileSystem }); await contract.deploy([ - 'Test NFT', - 'TST', - {'URL': []}, - {'None': []} + 'Test NFT', + 'TST', + {'None': []}, + {'URL': []}, ]); receiver_contract = await aeSdk.getContractInstance({ source: receiver_contract_source }); @@ -74,7 +74,7 @@ describe('mintable, burnable nft', () => { assert.equal(token_id, 0); { - const { decodedResult } = await contract.methods.metadata(0); + const { decodedResult } = await contract.methods.metadata(0); assert.equal(decodedResult.String[token_id], 'https://example.com/mynft'); } @@ -140,10 +140,10 @@ describe('mintable, burnable nft', () => { it('NFT: contract with base_url', async () => { let contract = await aeSdk.getContractInstance({ source, fileSystem }); await contract.deploy([ - 'Test NFT', - 'TST', - {'URL': []}, - 'https://example.com/' + 'Test NFT', + 'TST', + 'https://example.com/', + {'URL': []} ]); const token = await contract.methods.mint(wallets[0].publicKey, {'String': ['mynft']}, { onAccount: accounts[0] }); diff --git a/test/SwappableNFTTest.js b/test/SwappableNFTTest.js index 69bdf67..64f1b00 100644 --- a/test/SwappableNFTTest.js +++ b/test/SwappableNFTTest.js @@ -29,10 +29,10 @@ describe('swappable nft', () => { // initialize the contract instance contract = await aeSdk.getContractInstance({ source, fileSystem }); await contract.deploy([ - 'Test NFT', - 'TST', - {'URL': []}, - {'None': []} + 'Test NFT', + 'TST', + {'None': []}, + {'URL': []} ]); receiver_contract = await aeSdk.getContractInstance({ source: receiver_contract_source }); @@ -74,7 +74,7 @@ describe('swappable nft', () => { assert.equal(token_id, 0); { - const { decodedResult } = await contract.methods.metadata(0); + const { decodedResult } = await contract.methods.metadata(0); assert.equal(decodedResult.String[token_id], 'https://example.com/mynft'); } @@ -148,10 +148,10 @@ describe('swappable nft', () => { it('NFT: contract with base_url', async () => { let contract = await aeSdk.getContractInstance({ source, fileSystem }); await contract.deploy([ - 'Test NFT', - 'TST', - {'URL': []}, - 'https://example.com/' + 'Test NFT', + 'TST', + 'https://example.com/', + {'URL': []} ]); const token = await contract.methods.mint(wallets[0].publicKey, {'String': ['mynft']}, { onAccount: accounts[0] }); diff --git a/test/baseNFTTest.js b/test/baseNFTTest.js index 88afa4c..26538c4 100644 --- a/test/baseNFTTest.js +++ b/test/baseNFTTest.js @@ -31,8 +31,8 @@ describe('base nft', () => { await contract.deploy([ 'Test NFT', 'TST', - {'URL': []}, - {'None': []} + {'None': []}, + {'URL': []} ]); receiver_contract = await aeSdk.getContractInstance({ source: receiver_contract_source }); @@ -118,9 +118,9 @@ describe('base nft', () => { let contract = await aeSdk.getContractInstance({ source, fileSystem }); await contract.deploy([ 'Test NFT', - 'TST', - {'URL': []}, - 'https://example.com/' + 'TST', + 'https://example.com/', + {'URL': []} ]); const token = await contract.methods.define_token(wallets[0].publicKey, {'String': ['mynft']}, { onAccount: accounts[0] }); From b939d2a7dfc005ba1b16c7d5bd116570de942d0d Mon Sep 17 00:00:00 2001 From: marc0olo Date: Sat, 13 Aug 2022 20:28:57 +0200 Subject: [PATCH 2/2] ci: run tests via github actions --- .github/workflows/main.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..c9c3af6 --- /dev/null +++ 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