refactor: delete rlpOutputTx from ExitStarted event and inputTxs from…

… InFlightExitStarted event
omgnetwork · Aug 26, 2020 · 57df1d3 · 57df1d3
1 parent 901fbf3
commit 57df1d3
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/plasma_framework/contracts/src/exits/payment/controllers/PaymentStartInFlightExit.sol b/plasma_framework/contracts/src/exits/payment/controllers/PaymentStartInFlightExit.sol
@@ -39,7 +39,6 @@ library PaymentStartInFlightExit {
         bytes32 indexed txHash,
         bytes inFlightTx,
         uint256[] inputUtxosPos,
-        bytes[] inputTxs,
         bytes[] inFlightTxWitnesses
     );
 
@@ -114,7 +113,6 @@ library PaymentStartInFlightExit {
             txHash: startExitData.inFlightTxHash,
             inFlightTx: args.inFlightTx,
             inputUtxosPos: args.inputUtxosPos,
-            inputTxs: args.inputTxs,
             inFlightTxWitnesses: args.inFlightTxWitnesses
         });
     }

diff --git a/plasma_framework/contracts/src/exits/payment/controllers/PaymentStartStandardExit.sol b/plasma_framework/contracts/src/exits/payment/controllers/PaymentStartStandardExit.sol
@@ -44,8 +44,7 @@ library PaymentStartStandardExit {
     event ExitStarted(
         address indexed owner,
         uint168 exitId,
-        uint256 utxoPos,
-        bytes rlpOutputTx
+        uint256 utxoPos
     );
 
     /**
@@ -95,8 +94,7 @@ library PaymentStartStandardExit {
         emit ExitStarted({
             owner: msg.sender,
             exitId: data.exitId,
-            utxoPos: args.utxoPos,
-            rlpOutputTx: args.rlpOutputTx
+            utxoPos: args.utxoPos
         });
     }
 

diff --git a/plasma_framework/test/src/exits/payment/controllers/PaymentStartInFlightExit.test.js b/plasma_framework/test/src/exits/payment/controllers/PaymentStartInFlightExit.test.js
@@ -248,7 +248,6 @@ contract('PaymentStartInFlightExit', ([_, alice, richFather, carol]) => {
                 const logs = PaymentStartInFlightExit.decodeLogs(txReceipt.logs);
                 const event = logs.filter(e => e.event === 'InFlightExitStarted')[0];
 
-                expect(event.args.inputTxs).to.have.ordered.members(this.args.inputTxs);
                 expect(event.args.inFlightTxWitnesses).to.have.ordered.members(this.args.inFlightTxWitnesses);
 
                 const inputUtxosPos = this.args.inputUtxosPos.map(utxoPos => new BN(utxoPos));

diff --git a/plasma_framework/test/src/exits/payment/controllers/PaymentStartStandardExit.test.js b/plasma_framework/test/src/exits/payment/controllers/PaymentStartStandardExit.test.js
@@ -404,7 +404,6 @@ contract('PaymentStartStandardExit', ([_, outputOwner, nonOutputOwner]) => {
                     owner: outputOwner,
                     exitId,
                     utxoPos: new BN(args.utxoPos),
-                    rlpOutputTx: args.rlpOutputTx,
                 },
             );
         });
@@ -441,7 +440,6 @@ contract('PaymentStartStandardExit', ([_, outputOwner, nonOutputOwner]) => {
                     owner: outputOwner,
                     exitId: exitId1,
                     utxoPos: new BN(args[0].utxoPos),
-                    rlpOutputTx: args[0].rlpOutputTx,
                 },
             );
 
@@ -463,7 +461,6 @@ contract('PaymentStartStandardExit', ([_, outputOwner, nonOutputOwner]) => {
                     owner: outputOwner,
                     exitId: exitId2,
                     utxoPos: new BN(args[1].utxoPos),
-                    rlpOutputTx: args[1].rlpOutputTx,
                 },
             );
         });