m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-22 17:33:23 +01:00
Code

Remove unused parameters (#8216)

Browse Source 
These two parameters were never used in practice - a `null` was being
passed in explicitly.
This commit is contained in:
Mark Stacey 2020-03-19 14:32:38 -03:00 committed by GitHub
parent 84806bed9b
commit 1972adad76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/app/pages/send/send-content/add-recipient/add-recipient.js
View File

@ -11,7 +11,8 @@ import { checkExistingAddresses } from '../../../add-token/util'
import ethUtil from 'ethereumjs-util' import ethUtil from 'ethereumjs-util'
import contractMap from 'eth-contract-metadata' import contractMap from 'eth-contract-metadata'
export function getToErrorObject (to, toError = null, hasHexData = false, _, __, network) { export function getToErrorObject (to, hasHexData = false, _, __, network) {
let toError = null
if (!to) { if (!to) {
if (!hasHexData) { if (!hasHexData) {
toError = REQUIRED_ERROR toError = REQUIRED_ERROR
@ -23,7 +24,8 @@ export function getToErrorObject (to, toError = null, hasHexData = false, _, __,
return { to: toError } return { to: toError }
} }
export function getToWarningObject (to, toWarning = null, tokens = [], selectedToken = null) { export function getToWarningObject (to, tokens = [], selectedToken = null) {
let toWarning = null
if (selectedToken && (ethUtil.toChecksumAddress(to) in contractMap || checkExistingAddresses(to, tokens))) { if (selectedToken && (ethUtil.toChecksumAddress(to) in contractMap || checkExistingAddresses(to, tokens))) {
toWarning = KNOWN_RECIPIENT_ADDRESS_ERROR toWarning = KNOWN_RECIPIENT_ADDRESS_ERROR
} }

24
ui/app/pages/send/send-content/add-recipient/tests/add-recipient-utils.test.js
View File

@ -32,7 +32,7 @@ describe('add-recipient utils', function () {
}) })
it('should return null if to is falsy and hexData is truthy', function () { it('should return null if to is falsy and hexData is truthy', function () {
assert.deepEqual(getToErrorObject(null, undefined, true), { assert.deepEqual(getToErrorObject(null, true), {
to: null, to: null,
}) })
}) })
@ -49,31 +49,25 @@ describe('add-recipient utils', function () {
}) })
}) })
it('should return the passed error if to is truthy but invalid if to is truthy and valid', function () {
assert.deepEqual(getToErrorObject('invalid #$ 345878', 'someExplicitError'), {
to: 'someExplicitError',
})
})
it('should return null if to is truthy but part of state tokens', function () { it('should return null if to is truthy but part of state tokens', function () {
assert.deepEqual(getToErrorObject('0xabc123', undefined, false, [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), { assert.deepEqual(getToErrorObject('0xabc123', false, [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), {
to: null, to: null,
}) })
}) })
it('should null if to is truthy part of tokens but selectedToken falsy', function () { it('should null if to is truthy part of tokens but selectedToken falsy', function () {
assert.deepEqual(getToErrorObject('0xabc123', undefined, false, [{ 'address': '0xabc123' }]), { assert.deepEqual(getToErrorObject('0xabc123', false, [{ 'address': '0xabc123' }]), {
to: null, to: null,
}) })
}) })
it('should return null if to is truthy but part of contract metadata', function () { it('should return null if to is truthy but part of contract metadata', function () {
assert.deepEqual(getToErrorObject('0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359', undefined, false, [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), { assert.deepEqual(getToErrorObject('0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359', false, [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), {
to: null, to: null,
}) })
}) })
it('should null if to is truthy part of contract metadata but selectedToken falsy', function () { it('should null if to is truthy part of contract metadata but selectedToken falsy', function () {
assert.deepEqual(getToErrorObject('0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359', undefined, false, [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), { assert.deepEqual(getToErrorObject('0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359', false, [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), {
to: null, to: null,
}) })
}) })
@ -81,24 +75,24 @@ describe('add-recipient utils', function () {
describe('getToWarningObject()', function () { describe('getToWarningObject()', function () {
it('should return a known address recipient if to is truthy but part of state tokens', function () { it('should return a known address recipient if to is truthy but part of state tokens', function () {
assert.deepEqual(getToWarningObject('0xabc123', undefined, [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), { assert.deepEqual(getToWarningObject('0xabc123', [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), {
to: KNOWN_RECIPIENT_ADDRESS_ERROR, to: KNOWN_RECIPIENT_ADDRESS_ERROR,
}) })
}) })
it('should null if to is truthy part of tokens but selectedToken falsy', function () { it('should null if to is truthy part of tokens but selectedToken falsy', function () {
assert.deepEqual(getToWarningObject('0xabc123', undefined, [{ 'address': '0xabc123' }]), { assert.deepEqual(getToWarningObject('0xabc123', [{ 'address': '0xabc123' }]), {
to: null, to: null,
}) })
}) })
it('should return a known address recipient if to is truthy but part of contract metadata', function () { it('should return a known address recipient if to is truthy but part of contract metadata', function () {
assert.deepEqual(getToWarningObject('0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359', undefined, [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), { assert.deepEqual(getToWarningObject('0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359', [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), {
to: KNOWN_RECIPIENT_ADDRESS_ERROR, to: KNOWN_RECIPIENT_ADDRESS_ERROR,
}) })
}) })
it('should null if to is truthy part of contract metadata but selectedToken falsy', function () { it('should null if to is truthy part of contract metadata but selectedToken falsy', function () {
assert.deepEqual(getToWarningObject('0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359', undefined, [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), { assert.deepEqual(getToWarningObject('0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359', [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), {
to: KNOWN_RECIPIENT_ADDRESS_ERROR, to: KNOWN_RECIPIENT_ADDRESS_ERROR,
}) })
}) })

4
ui/app/pages/send/send.component.js
View File

@ -236,8 +236,8 @@ export default class SendTransactionScreen extends Component {
return this.setState({ toError: '', toWarning: '' }) return this.setState({ toError: '', toWarning: '' })
} }
const toErrorObject = getToErrorObject(query, null, hasHexData, tokens, selectedToken, network) const toErrorObject = getToErrorObject(query, hasHexData, tokens, selectedToken, network)
const toWarningObject = getToWarningObject(query, null, tokens, selectedToken) const toWarningObject = getToWarningObject(query, tokens, selectedToken)
this.setState({ this.setState({
toError: toErrorObject.to, toError: toErrorObject.to,