Skip to content
This repository has been archived by the owner on Jul 9, 2021. It is now read-only.

Commit

Permalink
Fix typos, run prettier, and allow anyone to call on DummyERC721Token
Browse files Browse the repository at this point in the history
  • Loading branch information
abandeali1 committed Aug 16, 2018
1 parent 1dadc8d commit 201d824
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ contract DummyERC20Token is
string public name;
string public symbol;
uint256 public decimals;
uint256 public constant MAX_MINT_AMOUNT = 10000000000000000000000;

constructor (
string _name,
Expand Down Expand Up @@ -67,7 +68,7 @@ contract DummyERC20Token is
external
{
require(
_value <= 10000000000000000000000,
_value <= MAX_MINT_AMOUNT,
"VALUE_TOO_LARGE"
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,12 @@ contract DummyERC721Token is
/// @param _tokenId ID of the token to be minted by the msg.sender
function mint(address _to, uint256 _tokenId)
external
onlyOwner
{
_mint(_to, _tokenId);
}

/// @dev Function to burn a token
/// Reverts if the given token ID doesn't exist
/// Reverts if the given token ID doesn't exist or not called by contract owner
/// @param _owner Owner of token with given token ID
/// @param _tokenId ID of the token to be burned by the msg.sender
function burn(address _owner, uint256 _tokenId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ contract ERC20Token is
/// @dev `msg.sender` approves `_spender` to spend `_value` tokens
/// @param _spender The address of the account able to transfer the tokens
/// @param _value The amount of wei to be approved for transfer
/// @return Always true if enough call has enough gas to complete execution
/// @return Always true if the call has enough gas to complete execution
function approve(address _spender, uint256 _value)
external
returns (bool)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ contract IERC20Token {
/// @dev `msg.sender` approves `_spender` to spend `_value` tokens
/// @param _spender The address of the account able to transfer the tokens
/// @param _value The amount of wei to be approved for transfer
/// @return Always true if enough call has enough gas to complete execution
/// @return Always true if the call has enough gas to complete execution
function approve(address _spender, uint256 _value)
external
returns (bool);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ contract ERC721Token is

/// @notice Transfers the ownership of an NFT from one address to another address
/// @dev Throws unless `msg.sender` is the current owner, an authorized
/// perator, or the approved address for this NFT. Throws if `_from` is
/// operator, or the approved address for this NFT. Throws if `_from` is
/// not the current owner. Throws if `_to` is the zero address. Throws if
/// `_tokenId` is not a valid NFT. When transfer is complete, this function
/// checks if `_to` is a smart contract (code size > 0). If so, it calls
Expand Down
9 changes: 6 additions & 3 deletions packages/contracts/test/tokens/erc721_token.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ import { BigNumber } from '@0xproject/utils';
import * as chai from 'chai';
import { LogWithDecodedArgs } from 'ethereum-types';

import { DummyERC721ReceiverContract } from '../../generated_contract_wrappers/dummy_erc721_receiver';
import {
DummyERC721ReceiverContract,
DummyERC721ReceiverTokenReceivedEventArgs,
} from '../../generated_contract_wrappers/dummy_erc721_receiver';
import {
DummyERC721TokenContract,
DummyERC721TokenTransferEventArgs,
Expand Down Expand Up @@ -132,7 +135,7 @@ describe('ERC721Token', () => {
expect(log.args._to).to.be.equal(to);
expect(log.args._tokenId).to.be.bignumber.equal(tokenId);
});
it('should transfer the token is spender is individually approved', async () => {
it('should transfer the token if spender is individually approved', async () => {
await web3Wrapper.awaitTransactionSuccessAsync(
await token.approve.sendTransactionAsync(spender, tokenId),
constants.AWAIT_TRANSACTION_MINED_MS,
Expand Down Expand Up @@ -265,7 +268,7 @@ describe('ERC721Token', () => {
const newOwner = await token.ownerOf.callAsync(tokenId);
expect(newOwner).to.be.equal(to);
const transferLog = txReceipt.logs[0] as LogWithDecodedArgs<DummyERC721TokenTransferEventArgs>;
const receiverLog = txReceipt.logs[1] as LogWithDecodedArgs<InvalidERC721ReceiverTokenReceivedEventArgs>;
const receiverLog = txReceipt.logs[1] as LogWithDecodedArgs<DummyERC721ReceiverTokenReceivedEventArgs>;
expect(transferLog.args._from).to.be.equal(from);
expect(transferLog.args._to).to.be.equal(to);
expect(transferLog.args._tokenId).to.be.bignumber.equal(tokenId);
Expand Down
2 changes: 1 addition & 1 deletion packages/types/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[
{
{
"version": "1.0.1-rc.5",
"changes": [
{
Expand Down
3 changes: 2 additions & 1 deletion packages/utils/CHANGELOG.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"pr": 807
},
{
"note": "Store different ABIs for events with same function signature and different amount of indexed arguments",
"note":
"Store different ABIs for events with same function signature and different amount of indexed arguments",
"pr": 933
}
],
Expand Down

0 comments on commit 201d824

Please sign in to comment.