fix conflict

OriginProtocol · Nov 10, 2023 · b9021d4 · b9021d4
2 parents ed6ba10 + 49649e4
commit b9021d4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/build_and_functional_tests.yml b/.github/workflows/build_and_functional_tests.yml
@@ -44,4 +44,3 @@ jobs:
       download_app_binaries_artifact: plugin_binaries
       additional_app_binaries_artifact: ethereum_build_develop
       additional_app_binaries_artifact_dir: ./tests/ethereum_build/build
-      test_dir: tests
diff --git a/ethereum-plugin-sdk b/ethereum-plugin-sdk
diff --git a/ledger_app.toml b/ledger_app.toml
@@ -0,0 +1,7 @@
+[app]
+build_directory = "./"
+sdk = "C"
+devices = ["nanos", "nanox", "nanos+", "stax"]
+
+[tests]
+pytest_directory = "./tests/"
diff --git a/src/handle_finalize.c b/src/handle_finalize.c
@@ -34,7 +34,6 @@ void handle_finalize(void *parameters) {
     received_network_token(context);
     msg->tokenLookup2 = NULL;
   }
-
   msg->uiType = ETH_UI_TYPE_GENERIC;
   msg->result = ETH_PLUGIN_RESULT_OK;
 }