Skip to content

Commit

Permalink
fix: imports order
Browse files Browse the repository at this point in the history
  • Loading branch information
0xkenj1 committed Apr 10, 2024
1 parent a03ef04 commit efe61fa
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 19 deletions.
4 changes: 2 additions & 2 deletions src/config/handlers.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import yargs from 'yargs';
import { configSchema } from './schemas';
import { Config } from '../types';
import fs from 'fs';
import { hideBin } from 'yargs/helpers';
import _ from 'lodash';
import { defaultConfig } from '../constants';
import { configSchema } from './schemas';
import { Config } from '../types';

/**
* Gets the config from the CLI or the config file
Expand Down
3 changes: 1 addition & 2 deletions src/processor.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import fs from 'fs/promises';
import { SourceUnit, FunctionDefinition, ContractDefinition } from 'solc-typed-ast';
import { Validator } from './validator';
import { NodeToProcess } from './types';
import { getLineNumberFromSrc, parseNodeNatspec } from './utils';
import { SourceUnit, FunctionDefinition, ContractDefinition } from 'solc-typed-ast';

export interface IWarning {
location: string;
messages: string[];
Expand Down
2 changes: 1 addition & 1 deletion src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from 'fs/promises';
import path from 'path';
import { Natspec, NatspecDefinition, NodeToProcess, KeysForSupportedTags } from './types';
import { ASTKind, ASTReader, SourceUnit, compileSol, FunctionDefinition } from 'solc-typed-ast';
import { Natspec, NatspecDefinition, NodeToProcess, KeysForSupportedTags } from './types';

/**
* Returns the absolute paths of the Solidity files
Expand Down
20 changes: 10 additions & 10 deletions src/validator.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
import {
EnumDefinition,
ErrorDefinition,
EventDefinition,
FunctionDefinition,
ModifierDefinition,
StructDefinition,
VariableDeclaration,
ContractDefinition,
} from 'solc-typed-ast';
import {
Config,
FunctionConfig,
Expand All @@ -10,16 +20,6 @@ import {
Tags,
} from './types';
import { matchesFunctionKind, getElementFrequency, isKeyForSupportedTags } from './utils';
import {
EnumDefinition,
ErrorDefinition,
EventDefinition,
FunctionDefinition,
ModifierDefinition,
StructDefinition,
VariableDeclaration,
ContractDefinition,
} from 'solc-typed-ast';

/**
* Validator class that validates the natspec of the nodes
Expand Down
2 changes: 1 addition & 1 deletion test/config.test.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as path from 'path';
import fs from 'fs';
import fstest from 'fs';
import _ from 'lodash';
import { getConfig, getFileConfig, getArgsConfig } from '../src/config';
import { defaultConfig } from '../src/constants';
import _, { includes } from 'lodash';

describe('Config', () => {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion test/processor.test.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import fs from 'fs/promises';
import { faker } from '@faker-js/faker';
import { ContractDefinition, FunctionDefinition, UserDefinedType, UsingForDirective, FunctionKind } from 'solc-typed-ast';
import { Processor, IWarning } from '../src/processor';
import * as utils from '../src/utils';
import { Validator } from '../src/validator';
import { mockFunctionDefinition, mockNodeToProcess, mockConfig, mockNatspec } from './utils/mocks';
import { getFileCompiledSource } from './utils/helpers';
import { ContractDefinition, FunctionDefinition, UserDefinedType, UsingForDirective, FunctionKind } from 'solc-typed-ast';

describe('Processor', () => {
const validator = new Validator(mockConfig({}));
Expand Down
2 changes: 1 addition & 1 deletion test/utils.test.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import fs from 'fs/promises';
import fstest from 'fs';
import path from 'path';
import { FunctionKind } from 'solc-typed-ast';
import * as utils from '../src/utils';
import { mockFoundryConfig, mockFunctionDefinition } from './utils/mocks';
import { FunctionKind } from 'solc-typed-ast';

describe('Utils', () => {
describe('getSolidityFilesAbsolutePaths', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/validator.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { ContractDefinition } from 'solc-typed-ast';
import { defaultConfig, defaultFunctions, defaultTags } from './utils/helpers';
import { Validator } from '../src/validator';
import { getFileCompiledSource, expectWarning, findNode } from './utils/helpers';
import { mockConfig, mockNatspec } from './utils/mocks';
import { ContractDefinition } from 'solc-typed-ast';

describe('Validator', () => {
let contract: ContractDefinition;
Expand Down

0 comments on commit efe61fa

Please sign in to comment.