Skip to content

Commit

Permalink
fix incorrect images
Browse files Browse the repository at this point in the history
  • Loading branch information
jleni committed May 25, 2021
1 parent 9c5f74a commit 8e400b0
Show file tree
Hide file tree
Showing 14 changed files with 37 additions and 54 deletions.
10 changes: 5 additions & 5 deletions .gdbinit
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# set auto-load local-gdbinit on
# add-auto-load-safe-path /

set architecture arm
handle SIGILL nostop pass noprint
add-symbol-file app/bin/app.elf 0x40000000
set backtrace limit 20
b *0x40000000
# set architecture arm
# handle SIGILL nostop pass noprint
# add-symbol-file app/bin/app.elf 0x40000000
# set backtrace limit 20
# b *0x40000000
60 changes: 25 additions & 35 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,40 +47,30 @@
# Kernel Module Compile Results
*.mod*
*.cmd
.tmp_versions/
modules.order
Module.symvers
Mkfile.old
dkms.conf

\cmake-build-debug
\.idea/
/tmp/
/deps/nano2-sdk/

# Created by cmake
googletest-download/
googletest-src/
googletest-build/
CMakeFiles/
CMakeCache.txt
unittests
*.cmake
Testing/
cmake-build-fuzz/

# Others
/cmake-build-debug/
/cmake-build-fuzz/
\.idea
/app/bin/
/app/debug/
/app/obj/

##########################

tests_zemu/.yarn/*
tests_zemu/!.yarn/patches
tests_zemu/!.yarn/releases
tests_zemu/!.yarn/plugins
tests_zemu/!.yarn/sdks
tests_zemu/!.yarn/versions
tests_zemu/.pnp.*

#########################

.vscode
.idea

node_modules
fuzz/corpora

!build/.gitkeep
build/*
cmake-build-debug

tests_zemu/snapshots-tmp
tests_zemu/yarn.lock
/tests_zemu/snapshots-tmp/
/build
/fuzz-*.log
/fuzz/corpora
/tests_tools/target/
!/tests_tools/neon/yarn.lock
tests_tools/target

2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if(ENABLE_FUZZING)
message(FATAL_ERROR "Fuzz logging enabled")
endif()

set(CMAKE_CXX_CLANG_TIDY clang-tidy -checks=-*,bugprone-*,cert-*,clang-analyzer-*,-cert-err58-cpp,misc-*,-bugprone-suspicious-include)
set(CMAKE_CXX_CLANG_TIDY clang-tidy -checks=-*,bugprone-*,cert-*,clang-analyzer-*,-cert-err58-cpp,misc-*)

if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# require at least clang 3.2
Expand Down
15 changes: 3 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@

ifeq ($(BOLOS_SDK),)
# In this case, there is not predefined SDK and we run dockerized
# When not using the SDK, we override and build the XL complete app

SUBSTRATE_PARSER_FULL ?= 1
include $(CURDIR)/deps/ledger-zxlib/dockerized_build.mk

else
Expand All @@ -33,18 +36,6 @@ default:
COIN=$(COIN) $(MAKE) -C app $@
endif

build_sr25519: SUPPORT_SR25519=1 # Alternative app purpose
build_sr25519: SUBSTRATE_PARSER_FULL=1 # Use full parser
build_sr25519: buildS
cp $(CURDIR)/app/bin/app.elf $(CURDIR)/app/output/app_sr25519.elf
cp $(CURDIR)/app/bin/app.elf $(CURDIR)/app/bin/app_sr25519.elf

build_full_parser_s: SUBSTRATE_PARSER_FULL=1
build_full_parser_s: buildS

build_full_parser_x: SUBSTRATE_PARSER_FULL=1
build_full_parser_x: buildX

tests_tools_build:
cd tests_tools/neon && yarn install

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ This project contains the Edgeware app (https://edgewa.re/) for Ledger Nano S an
- C++ unit tests
- Zemu tests

For more information: [How to build](docs/build.md)

## ATTENTION

Please:
Expand Down
Binary file modified tests_zemu/snapshots/s-mainmenu/00004.png
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/s-mainmenu/00006.png
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/s-mainmenu/00007.png
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/s-mainmenu/00011.png
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/s-mainmenu/00012.png
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/s-mainmenu/00013.png
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/x-mainmenu/00004.png
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/x-mainmenu/00011.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tests_zemu/tests/standard.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
******************************************************************************* */

import Zemu, { DEFAULT_START_OPTIONS } from '@zondax/zemu'
import { newEdgewareApp } from '@zondax/ledger-polkadot'
import { APP_SEED, models } from './common'
import { newEdgewareApp } from '@zondax/ledger-polkadot'

// @ts-ignore
import ed25519 from 'ed25519-supercop'
Expand Down

0 comments on commit 8e400b0

Please sign in to comment.