From 59cdc0d68672789de84f9794e65a846c525b723c Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 26 Sep 2019 13:26:26 +0300 Subject: [PATCH] tidy --- circuits/withdraw.circom | 1 - contracts/ETHMixer.sol | 4 +--- contracts/Mixer.sol | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/circuits/withdraw.circom b/circuits/withdraw.circom index 0599a89..27612d8 100644 --- a/circuits/withdraw.circom +++ b/circuits/withdraw.circom @@ -33,7 +33,6 @@ template Withdraw(levels, rounds) { signal input receiver; // not taking part in any computations signal input relayer; // not taking part in any computations signal input fee; // not taking part in any computations - signal private input nullifier; signal private input secret; signal private input pathElements[levels]; diff --git a/contracts/ETHMixer.sol b/contracts/ETHMixer.sol index 0c0741d..107fe6c 100644 --- a/contracts/ETHMixer.sol +++ b/contracts/ETHMixer.sol @@ -12,10 +12,8 @@ pragma solidity ^0.5.8; import "./Mixer.sol"; -import "@openzeppelin/contracts-ethereum-package/contracts/GSN/GSNRecipient.sol"; -import "@openzeppelin/contracts-ethereum-package/contracts/GSN/IRelayHub.sol"; -contract ETHMixer is Mixer, GSNRecipient { +contract ETHMixer is Mixer { constructor( address _verifier, uint256 _mixDenomination, diff --git a/contracts/Mixer.sol b/contracts/Mixer.sol index 96a3684..0f2017f 100644 --- a/contracts/Mixer.sol +++ b/contracts/Mixer.sol @@ -29,7 +29,7 @@ contract Mixer is MerkleTreeWithHistory { uint256 public mixDenomination; event Deposit(uint256 indexed commitment, uint256 leafIndex, uint256 timestamp); - event Withdraw(address to, uint256 nullifierHash, address indexed relayer, uint fee); + event Withdraw(address to, uint256 nullifierHash, address indexed relayer, uint256 fee); /** @dev The constructor