Delete old test helpers.

test/helpers/sign.js

@@ -3,7 +3,6 @@ const PADDED_SIGNATURE_SIZE = 2 * 96; // 96 bytes in hexadecimal string length
 
 const DUMMY_SIGNATURE = `0x${web3.utils.padLeft('', REAL_SIGNATURE_SIZE)}`;
 
-// messageHex = '0xdeadbeef'
 function toEthSignedMessageHash (messageHex) {
   const messageBuffer = Buffer.from(messageHex.substring(2), 'hex');
   const prefix = Buffer.from(`\u0019Ethereum Signed Message:\n${messageBuffer.length}`);
@@ -11,26 +10,13 @@ function toEthSignedMessageHash (messageHex) {
 }
 
 // signs message in node (ganache auto-applies "Ethereum Signed Message" prefix)
-// messageHex = '0xdeadbeef'
 const signMessage = (signer, messageHex = '0x') => {
-  return web3.eth.sign(messageHex, signer); // actually personal_sign
-};
-
-// @TODO - remove this when we migrate to web3-1.0.0
-const transformToFullName = function (json) {
-  if (json.name.indexOf('(') !== -1) {
-    return json.name;
-  }
-
-  const typeName = json.inputs.map(function (i) { return i.type; }).join();
-  return json.name + '(' + typeName + ')';
+  return web3.eth.sign(messageHex, signer);
 };
 
 /**
  * Create a signer between a contract and a signer for a voucher of method, args, and redeemer
  * Note that `method` is the web3 method, not the truffle-contract method
- * Well truffle is terrible, but luckily (?) so is web3 < 1.0, so we get to make our own method id
- *   fetcher because the method on the contract isn't actually the SolidityFunction object ಠ_ಠ
  * @param contract TruffleContract
  * @param signer address
  * @param redeemer address
@@ -47,16 +33,12 @@ const getSignFor = (contract, signer) => (redeemer, methodName, methodArgs = [])
   if (methodName) {
     if (methodArgs.length > 0) {
       parts.push(
-        contract.contract[methodName].getData(...methodArgs.concat([DUMMY_SIGNATURE])).slice(
-          0,
-          -1 * PADDED_SIGNATURE_SIZE
-        )
+        contract.contract.methods[methodName](...methodArgs.concat([DUMMY_SIGNATURE])).encodeABI()
+          .slice(0, -1 * PADDED_SIGNATURE_SIZE)
       );
     } else {
       const abi = contract.abi.find(abi => abi.name === methodName);
-      const name = transformToFullName(abi);
-      const signature = web3.utils.sha3(name).slice(0, 10);
-      parts.push(signature);
+      parts.push(abi.signature);
     }
   }