Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: bump js lib #95

Merged
merged 3 commits into from
Nov 19, 2024
Merged

feat: bump js lib #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0aa34a0
chore: bump js lib
emmanuelm41 Nov 19, 2024
6bfc986
chore: bump app version
emmanuelm41 Nov 19, 2024
b54227e
feat: update tests
emmanuelm41 Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/.cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[env]
HEAP_SIZE = "16384"
APPVERSION = "1.0.0"
APPVERSION = "1.1.0"

[unstable]
build-std = ["core", "alloc"]
Expand Down
2 changes: 1 addition & 1 deletion js
Open in desktop
Submodule js updated 3 files
+1 −1 package.json
+64 −0 src/consts.ts
+20 −19 src/index.ts
Binary file modified tests_zemu/snapshots/sp-mainmenu/00002.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/sp-mainmenu/00006.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions tests_zemu/tests/basic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe('Basic', function () {
})

// TODO fix ST and FL main menu
test.skip.each(models)('main menu', async function (m) {
test.each(models.filter(v => v.name === 'nanosp'))('main menu', async function (m) {
const sim = new Zemu(m.path)
try {
await sim.start({ ...defaultOptions, model: m.name, startText: startTextFn(m.name) })
Expand All @@ -58,7 +58,7 @@ describe('Basic', function () {

expect(resp.testMode).toBe(false)
expect(resp.major).toBe(1)
expect(resp.minor).toBe(0)
expect(resp.minor).toBe(1)
expect(resp.patch).toBe(0)
} finally {
await sim.close()
Expand Down
4 changes: 2 additions & 2 deletions tests_zemu/tests/failures.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,13 +235,13 @@ describe.each(models)('wrong actions', function (m) {
// Convert unknown error to string for comparison
const errorStr = String(error)
console.log('ErrorStr ', errorStr)
if (errorStr.includes('Unknown Return Code: 0xB027') || errorStr.includes('Timeout waiting for screen')) {
if (errorStr.includes('Expert mode is required')) {
throw new Error(errorStr)
}
throw error
}
}),
).rejects.toThrow(/Error: Unknown Return Code: 0xB027|Timeout waiting for screen/)
).rejects.toThrow(/Expert mode is required/)
}
} finally {
for (let i = 0; i < globalSims.length; i++) await globalSims[i].close()
Expand Down
39 changes: 32 additions & 7 deletions tests_zemu/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,11 +843,26 @@
rxjs "^7.8.1"
semver "^7.3.5"

"@ledgerhq/devices@^8.4.4":
version "8.4.4"
resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.4.4.tgz#0d195c1650fe57da2fad7f0d9074a0190947cd6f"
integrity sha512-sz/ryhe/R687RHtevIE9RlKaV8kkKykUV4k29e7GAVwzHX1gqG+O75cu1NCJUHLbp3eABV5FdvZejqRUlLis9A==
dependencies:
"@ledgerhq/errors" "^6.19.1"
"@ledgerhq/logs" "^6.12.0"
rxjs "^7.8.1"
semver "^7.3.5"

"@ledgerhq/errors@^6.18.0":
version "6.18.0"
resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.18.0.tgz#d55d6a57430d7a86532a9033ce0b45103264c620"
integrity sha512-L3jQWAGyooxRDk/MRlW2v4Ji9+kloBtdmz9wBkHaj2j0n+05rweJSV3GHw9oye1BYMbVFqFffmT4H3hlXlCasw==

"@ledgerhq/errors@^6.19.1":
version "6.19.1"
resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.19.1.tgz#d9ac45ad4ff839e468b8f63766e665537aaede58"
integrity sha512-75yK7Nnit/Gp7gdrJAz0ipp31CCgncRp+evWt6QawQEtQKYEDfGo10QywgrrBBixeRxwnMy1DP6g2oCWRf1bjw==

"@ledgerhq/hw-transport-http@^6.30.1":
version "6.30.2"
resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport-http/-/hw-transport-http-6.30.2.tgz#2b520641f10b1161e2afcda60a8e7d575b62f331"
Expand Down Expand Up @@ -884,7 +899,17 @@
node-hid "2.1.2"
usb "2.9.0"

"@ledgerhq/[email protected]", "@ledgerhq/hw-transport@^6.31.2":
"@ledgerhq/[email protected]":
version "6.31.4"
resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.31.4.tgz#9b23a6de4a4caaa5c24b149c2dea8adde46f0eb1"
integrity sha512-6c1ir/cXWJm5dCWdq55NPgCJ3UuKuuxRvf//Xs36Bq9BwkV2YaRQhZITAkads83l07NAdR16hkTWqqpwFMaI6A==
dependencies:
"@ledgerhq/devices" "^8.4.4"
"@ledgerhq/errors" "^6.19.1"
"@ledgerhq/logs" "^6.12.0"
events "^3.3.0"

"@ledgerhq/hw-transport@^6.31.2":
version "6.31.2"
resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.31.2.tgz#79c95f7928a64a0e3b5bc4ea7b5be04b9f738322"
integrity sha512-B27UIzMzm2IXPGYnEB95R7eHxpXBkTBHh6MUJJQZVknt8LilEz1tfpTYUdzAKDGQ+Z5MZyYb01Eh3Zqm3kn3uw==
Expand Down Expand Up @@ -1446,14 +1471,14 @@
"@zondax/ledger-ironfish@../js":
version "0.0.0"
dependencies:
"@zondax/ledger-js" "^1.0.1"
"@zondax/ledger-js" "^1.2.0"

"@zondax/ledger-js@^1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@zondax/ledger-js/-/ledger-js-1.0.1.tgz#a1c51943c5b7d1370cea588b193197234485d196"
integrity sha512-9h+aIXyEK+Rdic5Ppsmq+tptDFwPTacG1H6tpZHFdhtBFHYFOLLkKTTmq5rMTv84aAPS1v0tnsF1e2Il6M05Cg==
"@zondax/ledger-js@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@zondax/ledger-js/-/ledger-js-1.2.0.tgz#13fb6b4ac1b395f39d05d1efb23dfe97d6011463"
integrity sha512-HGvDU0s4zg0scu8ebGenFHFB6g5SLDqmrctncZUY9ie5pGibOU8C0VdjZSHbttSOCyh+IloLi/a4jyMPOEQGuQ==
dependencies:
"@ledgerhq/hw-transport" "6.31.2"
"@ledgerhq/hw-transport" "6.31.4"

"@zondax/zemu@^0.50.2":
version "0.50.2"
Expand Down
Loading