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

Remove unused getToErrorObject parameters (#8705)

Browse Source 
The third and fourth parameters were unused, so they have been removed.
The tests descriptions for both `getToErrorObject` and
`getToWarningObject` have been improved as well.
This commit is contained in:
Mark Stacey 2020-05-29 15:31:57 -03:00 committed by GitHub
parent c3b29e192a
commit df4b757479
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ import { checkExistingAddresses } from '../../../add-token/util'
import ethUtil from 'ethereumjs-util'
import contractMap from 'eth-contract-metadata'
export function getToErrorObject (to, hasHexData = false, _, __, network) {
export function getToErrorObject (to, hasHexData = false, network) {
let toError = null
if (!to) {
if (!hasHexData) {

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

@ -25,73 +25,50 @@ const {
describe('add-recipient utils', function () {
describe('getToErrorObject()', function () {
it('should return a required error if to is falsy', function () {
it('should return a required error if "to" is falsy', function () {
assert.deepEqual(getToErrorObject(null), {
to: REQUIRED_ERROR,
})
})
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, true), {
to: null,
})
})
it('should return an invalid recipient error if to is truthy but invalid', function () {
it('should return an invalid recipient error if "to" is truthy but invalid', function () {
assert.deepEqual(getToErrorObject('mockInvalidTo'), {
to: INVALID_RECIPIENT_ADDRESS_ERROR,
})
})
it('should return null if to is truthy and valid', function () {
it('should return null if "to" is truthy and valid', function () {
assert.deepEqual(getToErrorObject('0xabc123'), {
to: null,
})
})
it('should return null if to is truthy but part of state tokens', function () {
assert.deepEqual(getToErrorObject('0xabc123', false, [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), {
to: null,
})
})
it('should null if to is truthy part of tokens but sendToken falsy', function () {
assert.deepEqual(getToErrorObject('0xabc123', false, [{ 'address': '0xabc123' }]), {
to: null,
})
})
it('should return null if to is truthy but part of contract metadata', function () {
assert.deepEqual(getToErrorObject('0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359', false, [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), {
to: null,
})
})
it('should null if to is truthy part of contract metadata but sendToken falsy', function () {
assert.deepEqual(getToErrorObject('0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359', false, [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), {
to: null,
})
})
})
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 error if "to" is a token address', function () {
assert.deepEqual(getToWarningObject('0xabc123', [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), {
to: KNOWN_RECIPIENT_ADDRESS_ERROR,
})
})
it('should null if to is truthy part of tokens but sendToken falsy', function () {
it('should null if "to" is a token address but sendToken is falsy', function () {
assert.deepEqual(getToWarningObject('0xabc123', [{ 'address': '0xabc123' }]), {
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 error if "to" is part of contract metadata', function () {
assert.deepEqual(getToWarningObject('0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359', [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), {
to: KNOWN_RECIPIENT_ADDRESS_ERROR,
})
})
it('should null if to is truthy part of contract metadata but sendToken falsy', function () {
it('should null if "to" is part of contract metadata but sendToken is falsy', function () {
assert.deepEqual(getToWarningObject('0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359', [{ 'address': '0xabc123' }], { 'address': '0xabc123' }), {
to: KNOWN_RECIPIENT_ADDRESS_ERROR,
})

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

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