Remove order nested struct.ts

src/cairoWriter/writers/cairoContractWriter.ts

@@ -111,7 +111,7 @@ export class CairoContractWriter extends CairoASTNodeWriter {
       })
       .join('\n');
 
-    const freeStructs = getStructs(sourceUnit, this.ast);
+    const freeStructs = getStructs(sourceUnit);
     const structs = [...freeStructs, ...sourceUnit.vStructs, ...(node?.vStructs || [])]
       .map((v) => writer.write(v))
       .join('\n\n');

src/freeStructWritter.ts

@@ -5,8 +5,6 @@ import {
   StructDefinition,
   UserDefinedTypeName,
 } from 'solc-typed-ast';
-import { AST } from './ast/ast';
-import { makeStructTree, reorderStructs } from './passes/orderNestedStructs';
 
 /* 
   Library calls in solidity are delegate calls
@@ -18,9 +16,9 @@ import { makeStructTree, reorderStructs } from './passes/orderNestedStructs';
   function which do that.
 */
 
-export function getStructs(node: SourceUnit, ast: AST): StructDefinition[] {
+export function getStructs(node: SourceUnit): StructDefinition[] {
   const externalStructs = getDefinitionsToInline(node, node, new Set());
-  return reorderStructs(...makeStructTree(externalStructs, ast));
+  return Array.from(externalStructs.values());
 }
 
 // DFS a node for definitions in a free context.

src/passes/export.ts

@@ -33,7 +33,6 @@ export * from './literalExpressionEvaluator/export';
 export * from './loopFunctionaliser/export';
 export * from './namedArgsRemover';
 export * from './newToDeploy';
-export * from './orderNestedStructs';
 export * from './publicFunctionSplitter/export';
 export * from './referencedLibraries';
 export * from './references/export';

src/passes/index.ts

@@ -31,7 +31,6 @@ export * from './literalExpressionEvaluator/literalExpressionEvaluator';
 export * from './loopFunctionaliser';
 export * from './namedArgsRemover';
 export * from './newToDeploy';
-export * from './orderNestedStructs';
 export * from './publicFunctionSplitter';
 export * from './referencedLibraries';
 export * from './references';

src/transpiler.ts

@@ -35,7 +35,6 @@ import {
   ModifierHandler,
   NamedArgsRemover,
   NewToDeploy,
-  OrderNestedStructs,
   PublicFunctionSplitter,
   PublicStateVarsGetterGenerator,
   ReferencedLibraries,
@@ -120,7 +119,6 @@ function applyPasses(
     ['Req', Require],
     ['Ffi', FreeFunctionInliner],
     ['Rl', ReferencedLibraries],
-    ['Ons', OrderNestedStructs],
     ['Sa', StorageAllocator],
     ['Ii', InheritanceInliner],
     ['Ech', ExternalContractHandler],