Pointing entities to raw schema

Fix linter issues
This commit is contained in:
Jake Ellowitz
2018-11-13 09:57:02 -08:00
committed by Alex Browne
parent 599a3f9b96
commit 96134003e1
10 changed files with 120 additions and 123 deletions

View File

@@ -1,167 +1,165 @@
import {MigrationInterface, QueryRunner, Table} from "typeorm";
import { MigrationInterface, QueryRunner, Table } from 'typeorm';
const blocks = new Table({
name: 'raw.blocks',
columns: [
{name: 'number', type: 'bigint', isPrimary: true},
{name: 'hash', type: 'varchar', isPrimary: true},
{name: 'timestamp', type: 'bigint'}
]
{ name: 'number', type: 'bigint', isPrimary: true },
{ name: 'hash', type: 'varchar', isPrimary: true },
{ name: 'timestamp', type: 'bigint' },
],
});
const exchange_cancel_events = new Table({
name: 'raw.exchange_cancel_events',
columns: [
{name: 'contract_address', type: 'char(42)', isPrimary: true},
{name: 'log_index', type: 'integer', isPrimary: true},
{name: 'block_number', type: 'bigint', isPrimary: true},
{ name: 'contract_address', type: 'char(42)', isPrimary: true },
{ name: 'log_index', type: 'integer', isPrimary: true },
{ name: 'block_number', type: 'bigint', isPrimary: true },
{name: 'raw_data', type: 'varchar'},
{name: 'transaction_hash', type: 'varchar'},
{name: 'maker_address', type: 'char(42)'},
{name: 'taker_address', type: 'char(42)'},
{name: 'fee_recipient_address', type: 'char(42)'},
{name: 'sender_address', type: 'char(42)'},
{name: 'order_hash', type: 'varchar'},
{ name: 'raw_data', type: 'varchar' },
{name: 'raw_maker_asset_data', type: 'varchar'},
{name: 'maker_asset_type', type: 'varchar'},
{name: 'maker_asset_proxy_id', type: 'varchar'},
{name: 'maker_token_address', type: 'char(42)'},
{name: 'maker_token_id', type: 'varchar', isNullable: true},
{name: 'raw_taker_asset_data', type: 'varchar'},
{name: 'taker_asset_type', type: 'varchar'},
{name: 'taker_asset_proxy_id', type: 'varchar'},
{name: 'taker_token_address', type: 'char(42)'},
{name: 'taker_token_id', type: 'varchar', isNullable: true}
]
{ name: 'transaction_hash', type: 'varchar' },
{ name: 'maker_address', type: 'char(42)' },
{ name: 'taker_address', type: 'char(42)' },
{ name: 'fee_recipient_address', type: 'char(42)' },
{ name: 'sender_address', type: 'char(42)' },
{ name: 'order_hash', type: 'varchar' },
{ name: 'raw_maker_asset_data', type: 'varchar' },
{ name: 'maker_asset_type', type: 'varchar' },
{ name: 'maker_asset_proxy_id', type: 'varchar' },
{ name: 'maker_token_address', type: 'char(42)' },
{ name: 'maker_token_id', type: 'varchar', isNullable: true },
{ name: 'raw_taker_asset_data', type: 'varchar' },
{ name: 'taker_asset_type', type: 'varchar' },
{ name: 'taker_asset_proxy_id', type: 'varchar' },
{ name: 'taker_token_address', type: 'char(42)' },
{ name: 'taker_token_id', type: 'varchar', isNullable: true },
],
});
const exchange_cancel_up_to_events = new Table({
name: 'raw.exchange_cancel_up_to_events',
columns: [
{name: 'contract_address', type: 'char(42)', isPrimary: true},
{name: 'log_index', type: 'integer', isPrimary: true},
{name: 'block_number', type: 'bigint', isPrimary: true},
{ name: 'contract_address', type: 'char(42)', isPrimary: true },
{ name: 'log_index', type: 'integer', isPrimary: true },
{ name: 'block_number', type: 'bigint', isPrimary: true },
{name: 'raw_data', type: 'varchar'},
{name: 'transaction_hash', type: 'varchar'},
{name: 'maker_address', type: 'char(42)'},
{name: 'sender_address', type: 'char(42)'},
{name: 'order_epoch', type: 'varchar'}
]
{ name: 'raw_data', type: 'varchar' },
{ name: 'transaction_hash', type: 'varchar' },
{ name: 'maker_address', type: 'char(42)' },
{ name: 'sender_address', type: 'char(42)' },
{ name: 'order_epoch', type: 'varchar' },
],
});
const exchange_fill_events = new Table({
name: 'raw.exchange_fill_events',
columns: [
{name: 'contract_address', type: 'char(42)', isPrimary: true},
{name: 'log_index', type: 'integer', isPrimary: true},
{name: 'block_number', type: 'bigint', isPrimary: true},
{ name: 'contract_address', type: 'char(42)', isPrimary: true },
{ name: 'log_index', type: 'integer', isPrimary: true },
{ name: 'block_number', type: 'bigint', isPrimary: true },
{name: 'raw_data', type: 'varchar'},
{ name: 'raw_data', type: 'varchar' },
{name: 'transaction_hash', type: 'varchar'},
{name: 'maker_address', type: 'char(42)'},
{name: 'taker_address', type: 'char(42)'},
{name: 'fee_recipient_address', type: 'char(42)'},
{name: 'sender_address', type: 'char(42)'},
{name: 'maker_asset_filled_amount', type: 'varchar'},
{name: 'taker_asset_filled_amount', type: 'varchar'},
{name: 'maker_fee_paid', type: 'varchar'},
{name: 'taker_fee_paid', type: 'varchar'},
{name: 'order_hash', type: 'varchar'},
{ name: 'transaction_hash', type: 'varchar' },
{ name: 'maker_address', type: 'char(42)' },
{ name: 'taker_address', type: 'char(42)' },
{ name: 'fee_recipient_address', type: 'char(42)' },
{ name: 'sender_address', type: 'char(42)' },
{ name: 'maker_asset_filled_amount', type: 'varchar' },
{ name: 'taker_asset_filled_amount', type: 'varchar' },
{ name: 'maker_fee_paid', type: 'varchar' },
{ name: 'taker_fee_paid', type: 'varchar' },
{ name: 'order_hash', type: 'varchar' },
{name: 'raw_maker_asset_data', type: 'varchar'},
{name: 'maker_asset_type', type: 'varchar'},
{name: 'maker_asset_proxy_id', type: 'varchar'},
{name: 'maker_token_address', type: 'char(42)'},
{name: 'maker_token_id', type: 'varchar', isNullable: true},
{name: 'raw_taker_asset_data', type: 'varchar'},
{name: 'taker_asset_type', type: 'varchar'},
{name: 'taker_asset_proxy_id', type: 'varchar'},
{name: 'taker_token_address', type: 'char(42)'},
{name: 'taker_token_id', type: 'varchar', isNullable: true}
]
{ name: 'raw_maker_asset_data', type: 'varchar' },
{ name: 'maker_asset_type', type: 'varchar' },
{ name: 'maker_asset_proxy_id', type: 'varchar' },
{ name: 'maker_token_address', type: 'char(42)' },
{ name: 'maker_token_id', type: 'varchar', isNullable: true },
{ name: 'raw_taker_asset_data', type: 'varchar' },
{ name: 'taker_asset_type', type: 'varchar' },
{ name: 'taker_asset_proxy_id', type: 'varchar' },
{ name: 'taker_token_address', type: 'char(42)' },
{ name: 'taker_token_id', type: 'varchar', isNullable: true },
],
});
const relayers = new Table({
name: 'raw.relayers',
columns: [
{name: 'uuid', type: 'varchar', isPrimary: true},
{name: 'name', type: 'varchar'},
{name: 'sra_http_endpoint', type: 'varchar', isNullable: true},
{name: 'sra_ws_endpoint', type: 'varchar', isNullable: true},
{name: 'app_url', type: 'varchar', isNullable: true},
{name: 'fee_recipient_addresses', type: 'char(42)', isArray: true},
{name: 'taker_addresses', type: 'char(42)', isArray: true}
]
{ name: 'uuid', type: 'varchar', isPrimary: true },
{ name: 'name', type: 'varchar' },
{ name: 'sra_http_endpoint', type: 'varchar', isNullable: true },
{ name: 'sra_ws_endpoint', type: 'varchar', isNullable: true },
{ name: 'app_url', type: 'varchar', isNullable: true },
{ name: 'fee_recipient_addresses', type: 'char(42)', isArray: true },
{ name: 'taker_addresses', type: 'char(42)', isArray: true },
],
});
const sra_orders = new Table({
name: 'raw.sra_orders',
columns: [
{name: 'exchange_address', type: 'char(42)', isPrimary: true},
{name: 'order_hash_hex', type: 'varchar', isPrimary: true},
{ name: 'exchange_address', type: 'char(42)', isPrimary: true },
{ name: 'order_hash_hex', type: 'varchar', isPrimary: true },
{name: 'source_url', type: 'varchar'},
{name: 'last_updated_timestamp', type: 'bigint'},
{name: 'first_seen_timestamp', type: 'bigint'},
{name: 'maker_address', type: 'char(42)'},
{name: 'taker_address', type: 'char(42)'},
{name: 'fee_recipient_address', type: 'char(42)'},
{name: 'sender_address', type: 'char(42)'},
{name: 'maker_asset_filled_amount', type: 'varchar'},
{name: 'taker_asset_filled_amount', type: 'varchar'},
{name: 'maker_fee', type: 'varchar'},
{name: 'taker_fee', type: 'varchar'},
{name: 'expiration_time_seconds', type: 'int'},
{name: 'salt', type: 'varchar'},
{name: 'signature', type: 'varchar'},
{ name: 'source_url', type: 'varchar' },
{ name: 'last_updated_timestamp', type: 'bigint' },
{ name: 'first_seen_timestamp', type: 'bigint' },
{name: 'raw_maker_asset_data', type: 'varchar'},
{name: 'maker_asset_type', type: 'varchar'},
{name: 'maker_asset_proxy_id', type: 'varchar'},
{name: 'maker_token_address', type: 'char(42)'},
{name: 'maker_token_id', type: 'varchar', isNullable: true},
{name: 'raw_taker_asset_data', type: 'varchar'},
{name: 'taker_asset_type', type: 'varchar'},
{name: 'taker_asset_proxy_id', type: 'varchar'},
{name: 'taker_token_address', type: 'char(42)'},
{name: 'taker_token_id', type: 'varchar', isNullable: true},
{ name: 'maker_address', type: 'char(42)' },
{ name: 'taker_address', type: 'char(42)' },
{ name: 'fee_recipient_address', type: 'char(42)' },
{ name: 'sender_address', type: 'char(42)' },
{ name: 'maker_asset_filled_amount', type: 'varchar' },
{ name: 'taker_asset_filled_amount', type: 'varchar' },
{ name: 'maker_fee', type: 'varchar' },
{ name: 'taker_fee', type: 'varchar' },
{ name: 'expiration_time_seconds', type: 'int' },
{ name: 'salt', type: 'varchar' },
{ name: 'signature', type: 'varchar' },
{name: 'metadata_json', type: 'varchar'}
]
{ name: 'raw_maker_asset_data', type: 'varchar' },
{ name: 'maker_asset_type', type: 'varchar' },
{ name: 'maker_asset_proxy_id', type: 'varchar' },
{ name: 'maker_token_address', type: 'char(42)' },
{ name: 'maker_token_id', type: 'varchar', isNullable: true },
{ name: 'raw_taker_asset_data', type: 'varchar' },
{ name: 'taker_asset_type', type: 'varchar' },
{ name: 'taker_asset_proxy_id', type: 'varchar' },
{ name: 'taker_token_address', type: 'char(42)' },
{ name: 'taker_token_id', type: 'varchar', isNullable: true },
{ name: 'metadata_json', type: 'varchar' },
],
});
const token_on_chain_metadata = new Table({
name: 'raw.token_on_chain_metadata',
columns: [
{name: 'address', type: 'char(42)', isPrimary: true},
{name: 'decimals', type: 'integer'},
{name: 'symbol', type: 'varchar'},
{name: 'name', type: 'varchar'}
]
{ name: 'address', type: 'char(42)', isPrimary: true },
{ name: 'decimals', type: 'integer' },
{ name: 'symbol', type: 'varchar' },
{ name: 'name', type: 'varchar' },
],
});
const transactions = new Table({
name: 'raw.transactions',
columns: [
{name: 'block_number', type: 'bigint', isPrimary: true},
{name: 'block_hash', type: 'varchar', isPrimary: true},
{name: 'transaction_hash', type: 'varchar', isPrimary: true},
{name: 'gas_used', type: 'bigint'},
{name: 'gas_price', type: 'bigint'}
]
{ name: 'block_number', type: 'bigint', isPrimary: true },
{ name: 'block_hash', type: 'varchar', isPrimary: true },
{ name: 'transaction_hash', type: 'varchar', isPrimary: true },
{ name: 'gas_used', type: 'bigint' },
{ name: 'gas_price', type: 'bigint' },
],
});
export class InitialSchema1542070840010 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<any> {
await queryRunner.createSchema('raw');
await queryRunner.createTable(blocks);
@@ -175,7 +173,6 @@ export class InitialSchema1542070840010 implements MigrationInterface {
}
public async down(queryRunner: QueryRunner): Promise<any> {
await queryRunner.dropTable(blocks.name);
await queryRunner.dropTable(exchange_cancel_events.name);
await queryRunner.dropTable(exchange_cancel_up_to_events.name);

View File

@@ -13,7 +13,7 @@
"test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
"coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
"clean": "shx rm -rf lib",
"lint": "tslint --project . --format stylish --exclude ./migrations",
"lint": "tslint --project . --format stylish --exclude ./migrations/**/*",
"migrate:run": "yarn typeorm migration:run --config ./lib/src/ormconfig",
"migrate:revert": "yarn typeorm migration:revert --config ./lib/src/ormconfig",
"migrate:create": "yarn typeorm migration:create --config ./lib/src/ormconfig --dir migrations"

View File

@@ -1,6 +1,6 @@
import { Column, Entity, PrimaryColumn } from 'typeorm';
@Entity({ name: 'blocks' })
@Entity({ name: 'blocks', schema: 'raw' })
export class Block {
@PrimaryColumn() public hash!: string;
@PrimaryColumn() public number!: number;

View File

@@ -2,7 +2,7 @@ import { Column, Entity, PrimaryColumn } from 'typeorm';
import { AssetType } from '../types';
@Entity({ name: 'exchange_cancel_events' })
@Entity({ name: 'exchange_cancel_events', schema: 'raw' })
export class ExchangeCancelEvent {
@PrimaryColumn({ name: 'contract_address' })
public contractAddress!: string;

View File

@@ -1,6 +1,6 @@
import { Column, Entity, PrimaryColumn } from 'typeorm';
@Entity({ name: 'exchange_cancel_up_to_events' })
@Entity({ name: 'exchange_cancel_up_to_events', schema: 'raw' })
export class ExchangeCancelUpToEvent {
@PrimaryColumn({ name: 'contract_address' })
public contractAddress!: string;

View File

@@ -2,7 +2,7 @@ import { Column, Entity, PrimaryColumn } from 'typeorm';
import { AssetType } from '../types';
@Entity({ name: 'exchange_fill_events' })
@Entity({ name: 'exchange_fill_events', schema: 'raw' })
export class ExchangeFillEvent {
@PrimaryColumn({ name: 'contract_address' })
public contractAddress!: string;

View File

@@ -1,6 +1,6 @@
import { Column, Entity, PrimaryColumn } from 'typeorm';
@Entity({ name: 'relayers' })
@Entity({ name: 'relayers', schema: 'raw' })
export class Relayer {
@PrimaryColumn() public uuid!: string;

View File

@@ -2,7 +2,7 @@ import { Column, Entity, PrimaryColumn } from 'typeorm';
import { AssetType } from '../types';
@Entity({ name: 'sra_orders' })
@Entity({ name: 'sra_orders', schema: 'raw' })
export class SraOrder {
@PrimaryColumn({ name: 'exchange_address' })
public exchangeAddress!: string;

View File

@@ -1,6 +1,6 @@
import { Column, Entity, PrimaryColumn } from 'typeorm';
@Entity({ name: 'token_on_chain_metadata' })
@Entity({ name: 'token_on_chain_metadata', schema: 'raw' })
export class TokenOnChainMetadata {
@PrimaryColumn({ type: 'nvarchar', nullable: false })
public address!: string;
@@ -13,4 +13,4 @@ export class TokenOnChainMetadata {
@Column({ type: 'nvarchar', nullable: false })
public name!: string;
}
}

View File

@@ -1,6 +1,6 @@
import { Column, Entity, PrimaryColumn } from 'typeorm';
@Entity({ name: 'transactions' })
@Entity({ name: 'transactions', schema: 'raw' })
export class Transaction {
@PrimaryColumn({ name: 'transaction_hash' })
public transactionHash!: string;