Resolve conflicts

Author: franciszekjob

starknet_py/tests/unit/signer/allow_ledger_blind_signing.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 
-curl -d '{"action":"press-and-release"}' http://127.0.0.1:5000/button/right # Go to version screen
-curl -d '{"action":"press-and-release"}' http://127.0.0.1:5000/button/right # Go to settings screen
-curl -d '{"action":"press-and-release"}' http://127.0.0.1:5000/button/both # Go to blind signing screen
-curl -d '{"action":"press-and-release"}' http://127.0.0.1:5000/button/both # Allow blind signing
-curl -d '{"action":"press-and-release"}' http://127.0.0.1:5000/button/left # Go to "Back" screen
-curl -d '{"action":"press-and-release"}' http://127.0.0.1:5000/button/both # Return to main screen
+curl -d '{"action":"press-and-release"}' http://127.0.0.1:5001/button/right # Go to version screen
+curl -d '{"action":"press-and-release"}' http://127.0.0.1:5001/button/right # Go to settings screen
+curl -d '{"action":"press-and-release"}' http://127.0.0.1:5001/button/both # Go to blind signing screen
+curl -d '{"action":"press-and-release"}' http://127.0.0.1:5001/button/both # Allow blind signing
+curl -d '{"action":"press-and-release"}' http://127.0.0.1:5001/button/left # Go to "Back" screen
+curl -d '{"action":"press-and-release"}' http://127.0.0.1:5001/button/both # Return to main screen

starknet_py/tests/unit/signer/test_ledger_signer.py

@@ -214,7 +214,6 @@ async def test_deploy_account_and_transfer(client):
     signer = LedgerSigner(
         chain_id=StarknetChainId.SEPOLIA,
     )
-    # argent v0.4.0 class hash
     class_hash = 0x061DAC032F228ABEF9C6626F995015233097AE253A7F72D68552DB02F2971B8F
     salt = 1
     calldata = [signer.public_key]