revert changes that are for another PR

FuelLabs · Jan 3, 2025 · 142be12 · 142be12
1 parent 54f32ef
commit 142be12
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 34 deletions.
diff --git a/.changeset/spicy-oranges-worry.md b/.changeset/spicy-oranges-worry.md
@@ -0,0 +1,5 @@
+---
+"fuels": patch
+---
+
+fix: enable usage of `0` port for the `fuelCorePort` field
diff --git a/apps/docs/src/guide/fuels-cli/commands.md b/apps/docs/src/guide/fuels-cli/commands.md
@@ -15,17 +15,11 @@ npx fuels@{{fuels}} help init
 
 ```console
 Options:
-  --path <path>                Path to project root (default: root of current project)
-  -w, --workspace <path>       Relative dir path to Forc workspace
-  -c, --contracts [paths...]   Relative paths to Contracts
-  -s, --scripts [paths...]     Relative paths to Scripts
-  -p, --predicates [paths...]  Relative paths to Predicates
-  -o, --output <path>          Relative dir path for Typescript generation output
-  --forc-path <path>           Path to the `forc` binary
-  --fuel-core-path <path>      Path to the `fuel-core` binary
-  --auto-start-fuel-core       Auto-starts a `fuel-core` node during `dev` command
-  --fuel-core-port <port>      Port to use when starting a local `fuel-core` node for dev mode
-  -h, --help                   Display help
+  -w, --workspace <path>          Relative dir path to Forc workspace
+  -c, --contracts <path|global>   Relative path/globals to  Contracts
+  -s, --scripts <path|global>     Relative path/globals to  Scripts
+  -p, --predicates <path|global>  Relative path/globals to  Predicates
+  -o, --output <path>             Relative dir path for Typescript generation
 ```
 
 Creating a sample `fuel.config.ts` file:

diff --git a/packages/fuels/src/cli.ts b/packages/fuels/src/cli.ts
@@ -65,10 +65,6 @@ export const configureCli = () => {
     .option('--forc-path <path>', 'Path to the `forc` binary')
     .option('--fuel-core-path <path>', 'Path to the `fuel-core` binary')
     .option('--auto-start-fuel-core', 'Auto-starts a `fuel-core` node during `dev` command')
-    .option(
-      '--fuel-core-port <port>',
-      'Port to use when starting a local `fuel-core` node for dev mode'
-    )
     .action(withProgram(command, Commands.init, init));
 
   (command = program.command(Commands.dev))

diff --git a/packages/fuels/src/cli/commands/init/index.ts b/packages/fuels/src/cli/commands/init/index.ts
@@ -10,7 +10,7 @@ import { log } from '../../utils/logger';
 export function init(program: Command) {
   const options = program.opts();
 
-  const { path, autoStartFuelCore, forcPath, fuelCorePath, fuelCorePort } = options;
+  const { path, autoStartFuelCore, forcPath, fuelCorePath } = options;
 
   let workspace: string | undefined;
   let absoluteWorkspace: string | undefined;
@@ -61,7 +61,6 @@ export function init(program: Command) {
       forcPath,
       fuelCorePath,
       autoStartFuelCore,
-      fuelCorePort,
     });
 
     writeFileSync(fuelsConfigPath, renderedConfig);

diff --git a/packages/fuels/src/cli/templates/fuels.config.hbs b/packages/fuels/src/cli/templates/fuels.config.hbs
@@ -36,9 +36,6 @@ export default createConfig({
   {{#if (isDefined autoStartFuelCore)}}
   autoStartFuelCore: {{autoStartFuelCore}},
   {{/if}}
-  {{#if (isDefined fuelCorePort)}}
-  fuelCorePort: {{fuelCorePort}},
-  {{/if}}
 });
 
 /**

diff --git a/packages/fuels/src/cli/templates/fuels.config.ts b/packages/fuels/src/cli/templates/fuels.config.ts
@@ -16,7 +16,6 @@ export function renderFuelsConfigTemplate(props: {
   forcPath?: string;
   fuelCorePath?: string;
   autoStartFuelCore?: boolean;
-  fuelCorePort?: string;
 }) {
   const renderTemplate = Handlebars.compile(fuelsConfigTemplate, {
     strict: true,

diff --git a/packages/fuels/test/features/init.test.ts b/packages/fuels/test/features/init.test.ts
@@ -112,18 +112,6 @@ describe('init', () => {
     expect(fuelsContents).toMatch(`fuelCorePath: 'fuels-core',`);
   });
 
-  it('should run `init` command with custom fuel-core-port', async () => {
-    await runInit({
-      root: paths.root,
-      workspace: paths.workspaceDir,
-      output: paths.outputDir,
-      fuelCorePort: '1234',
-    });
-
-    const fuelsContents = readFileSync(paths.fuelsConfigPath, 'utf-8');
-    expect(fuelsContents).toMatch(`fuelCorePort: 1234,`);
-  });
-
   it('should run `init` command and throw for existent config file', async () => {
     const { error } = mockLogger();
 

diff --git a/packages/fuels/test/utils/runCommands.ts b/packages/fuels/test/utils/runCommands.ts
@@ -139,7 +139,6 @@ export async function runInit(params: InitParams) {
     flag(['--forc-path', forcPath], forcPath),
     flag(['--fuel-core-path', fuelCorePath], fuelCorePath),
     flag(['--auto-start-fuel-core'], autoStartFuelCore),
-    flag(['--fuel-core-port', fuelCorePort], fuelCorePort),
   ].flat();
 
   const command = await runCommand(Commands.init, flags);
@@ -154,6 +153,16 @@ export async function runInit(params: InitParams) {
     writeFileSync(configPath, config.replace(search, replace));
   }
 
+  if (fuelCorePort) {
+    const configPath = join(root, 'fuels.config.ts');
+    const config = readFileSync(configPath, 'utf-8');
+
+    const search = /(^.*fuelCorePath:.*$)/m;
+    const replace = `$1\n  fuelCorePort: '${fuelCorePort}',`;
+
+    writeFileSync(configPath, config.replace(search, replace));
+  }
+
   return command;
 }