wip: fix e2e, unit

anoma · Jul 18, 2023 · 108d941 · 108d941
1 parent eef7a30
commit 108d941
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/apps/src/lib/node/ledger/shell/process_proposal.rs b/apps/src/lib/node/ledger/shell/process_proposal.rs
@@ -1576,7 +1576,8 @@ mod test_process_proposal {
         assert_eq!(
             response.result.info,
             String::from(
-                "WrapperTx signature verification failed: The wrapper signature is invalid."
+                "WrapperTx signature verification failed: The wrapper \
+                 signature is invalid."
             )
         );
     }
@@ -1624,7 +1625,9 @@ mod test_process_proposal {
                 } else {
                     panic!("Test failed")
                 };
-                let expected_error = "WrapperTx signature verification failed: The wrapper signature is invalid.";
+                let expected_error = "WrapperTx signature verification \
+                                      failed: The wrapper signature is \
+                                      invalid.";
                 assert_eq!(
                     response.result.code,
                     u32::from(ErrorCodes::InvalidSig)

diff --git a/shared/src/ledger/signing.rs b/shared/src/ledger/signing.rs
@@ -233,6 +233,9 @@ pub async fn sign_tx<U: WalletUtils>(
     // Sign over the transaction targets
     tx.add_section(Section::SectionSignature(multisignature_section));
 
+    // Remove all the sensitive sections
+    tx.protocol_filter();
+
     let fee_payer = match &args.fee_payer {
         Some(keypair) => keypair,
         None => {

diff --git a/tests/src/e2e/ibc_tests.rs b/tests/src/e2e/ibc_tests.rs
@@ -220,7 +220,7 @@ fn create_client(test_a: &Test, test_b: &Test) -> Result<(ClientId, ClientId)> {
         consensus_state: make_consensus_state(test_b, height)?.into(),
         signer: Signer::from_str("test_a").expect("invalid signer"),
     };
-    let height_a = submit_ibc_tx(test_a, message, ALBERT, ALBERT_KEY, true)?;
+    let height_a = submit_ibc_tx(test_a, message, ALBERT, ALBERT_KEY, false)?;
 
     let height = query_height(test_a)?;
     let client_state = make_client_state(test_a, height);
@@ -230,7 +230,7 @@ fn create_client(test_a: &Test, test_b: &Test) -> Result<(ClientId, ClientId)> {
         consensus_state: make_consensus_state(test_a, height)?.into(),
         signer: Signer::from_str("test_b").expect("invalid signer"),
     };
-    let height_b = submit_ibc_tx(test_b, message, ALBERT, ALBERT_KEY, true)?;
+    let height_b = submit_ibc_tx(test_b, message, ALBERT, ALBERT_KEY, false)?;
 
     // convert the client IDs from `ibc_relayer_type` to `ibc`
     let client_id_a = match get_event(test_a, height_a)? {
@@ -852,7 +852,7 @@ fn transfer_back(
         port_channel_id_b,
         Some(sub_prefix),
         None,
-        true,
+        false,
     )?;
     let packet = match get_event(test_b, height)? {
         Some(IbcEvent::SendPacket(event)) => event.packet,

diff --git a/tests/src/e2e/ledger_tests.rs b/tests/src/e2e/ledger_tests.rs
@@ -769,7 +769,7 @@ fn masp_txs_and_queries() -> Result<()> {
                 "--node",
                 &validator_one_rpc,
             ],
-            ("Transaction is valid", true),
+            ("Transaction is valid", false),
         ),
         // 5. Attempt to spend 10 ETH at SK(A) to PA(B)
         (