From 1bbaf51ad6809203ef725c0440f0398ef822ccdf Mon Sep 17 00:00:00 2001
From: Pierrick Turelier <pierrick@turelier.com>
Date: Mon, 1 Nov 2021 18:38:56 -0500
Subject: [PATCH] fix(EIP2612): use only one struct for signature

---
 contracts/permit/EIP2612PermitAndDeposit.sol | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/contracts/permit/EIP2612PermitAndDeposit.sol b/contracts/permit/EIP2612PermitAndDeposit.sol
index c05b793f..3d32f1f0 100644
--- a/contracts/permit/EIP2612PermitAndDeposit.sol
+++ b/contracts/permit/EIP2612PermitAndDeposit.sol
@@ -10,24 +10,12 @@ import "../interfaces/IPrizePool.sol";
 import "../interfaces/ITicket.sol";
 
 /**
- * @notice Permit signature to allow spending of ERC20 token by this contract.
+ * @notice Secp256k1 signature values.
  * @param v `v` portion of the signature
  * @param r `r` portion of the signature
  * @param s `s` portion of the signature
  */
-struct PermitSignature {
-    uint8 v;
-    bytes32 r;
-    bytes32 s;
-}
-
-/**
- * @notice Delegate signature to allow delegation of tickets to delegate.
- * @param v `v` portion of the signature
- * @param r `r` portion of the signature
- * @param s `s` portion of the signature
- */
-struct DelegateSignature {
+struct Signature {
     uint8 v;
     bytes32 r;
     bytes32 s;
@@ -56,8 +44,8 @@ contract EIP2612PermitAndDeposit {
         address _owner,
         uint256 _amount,
         uint256 _deadline,
-        PermitSignature calldata _permitSignature,
-        DelegateSignature calldata _delegateSignature,
+        Signature calldata _permitSignature,
+        Signature calldata _delegateSignature,
         address _prizePool,
         address _to,
         ITicket _ticket,