fix: maintain odl nomenclature

near · Sep 27, 2024 · 0c91b60 · 0c91b60
1 parent 16eb842
commit 0c91b60
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 13 deletions.
diff --git a/src/messages.ts b/src/messages.ts
@@ -27,7 +27,7 @@ export const successContractToText = (contract: Contract) =>
   contract === 'none'
     ? ''
     : chalk`a smart contract in {bold ${
-      contract === 'rust' ? 'Rust' : 'Typescript'
+      contract === 'rs' ? 'Rust' : 'Typescript'
     }}`;
 
 const frontendTemplates: FrontendMessage = {
@@ -52,7 +52,7 @@ export const setupSuccess = (
   contract
 )}${successFrontendToText(frontend)}.
 ${
-  contract === 'rust'
+  contract === 'rs'
     ? chalk`🦀 If you are new to Rust please visit {bold {green https://www.rust-lang.org }}\n`
     : ''
 }
@@ -74,20 +74,20 @@ export const contractInstructions = (
    - {inverse Navigate to your project}:
          {blue cd {bold ${projectName}}}
 ${
-  contract === 'javascript' && !install
+  contract === 'ts' && !install
     ? chalk`   - {inverse Install all dependencies}
          {blue npm {bold install}}`
     : 'Then:'
 }
    - {inverse Build your contract}:
          ${
-  contract === 'javascript'
+  contract === 'ts'
     ? chalk`{blue npm {bold run build}}`
     : chalk`{blue {bold cargo near build}}`
 }
    - {inverse Test your contract} in the Sandbox:
          ${
-  contract === 'javascript'
+  contract === 'ts'
     ? chalk`{blue npm {bold run test}}`
     : chalk`{blue {bold cargo test}}`
 }

diff --git a/src/types.ts b/src/types.ts
@@ -1,5 +1,5 @@
-export type Contract = 'javascript' | 'rust' | 'none';
-export const CONTRACTS: Contract[] = ['javascript', 'rust', 'none'];
+export type Contract = 'ts' | 'rs' | 'none';
+export const CONTRACTS: Contract[] = ['ts', 'rs', 'none'];
 
 export type Frontend = 'next-app' | 'next-page' | 'none';
 export const FRONTENDS: Frontend[] = ['next-app' , 'next-page', 'none'];

diff --git a/src/user-input.ts b/src/user-input.ts
@@ -39,8 +39,8 @@ const appChoices: Choices<App> = [
   },
 ];
 const contractChoices: Choices<Contract> = [
-  { title: 'JS/TS Contract', description: 'A Near contract written in javascript/typescript', value: 'javascript' },
-  { title: 'Rust Contract', description: 'A Near contract written in Rust', value: 'rust' },
+  { title: 'JS/TS Contract', description: 'A Near contract written in javascript/typescript', value: 'ts' },
+  { title: 'Rust Contract', description: 'A Near contract written in Rust', value: 'rs' },
 ];
 
 const frontendChoices: Choices<Frontend> = [

diff --git a/templates/contracts/rust/Cargo.lock → templates/contracts/rs/Cargo.lock b/templates/contracts/rust/Cargo.lock → templates/contracts/rs/Cargo.lock
diff --git a/templates/contracts/rust/Cargo.toml → templates/contracts/rs/Cargo.toml b/templates/contracts/rust/Cargo.toml → templates/contracts/rs/Cargo.toml
diff --git a/templates/contracts/rust/README.md → templates/contracts/rs/README.md b/templates/contracts/rust/README.md → templates/contracts/rs/README.md
diff --git a/templates/contracts/rust/rust-toolchain.toml → templates/contracts/rs/rust-toolchain.toml b/templates/contracts/rust/rust-toolchain.toml → templates/contracts/rs/rust-toolchain.toml
diff --git a/templates/contracts/rust/src/lib.rs → templates/contracts/rs/src/lib.rs b/templates/contracts/rust/src/lib.rs → templates/contracts/rs/src/lib.rs
diff --git a/...lates/contracts/rust/tests/test_basics.rs → templates/contracts/rs/tests/test_basics.rs b/...lates/contracts/rust/tests/test_basics.rs → templates/contracts/rs/tests/test_basics.rs
diff --git a/templates/contracts/javascript/README.md → templates/contracts/ts/README.md b/templates/contracts/javascript/README.md → templates/contracts/ts/README.md
diff --git a/templates/contracts/javascript/package.json → templates/contracts/ts/package.json b/templates/contracts/javascript/package.json → templates/contracts/ts/package.json
diff --git a/...racts/javascript/sandbox-test/main.ava.js → ...tes/contracts/ts/sandbox-test/main.ava.js b/...racts/javascript/sandbox-test/main.ava.js → ...tes/contracts/ts/sandbox-test/main.ava.js
diff --git a/...ates/contracts/javascript/src/contract.ts → templates/contracts/ts/src/contract.ts b/...ates/contracts/javascript/src/contract.ts → templates/contracts/ts/src/contract.ts
diff --git a/templates/contracts/javascript/tsconfig.json → templates/contracts/ts/tsconfig.json b/templates/contracts/javascript/tsconfig.json → templates/contracts/ts/tsconfig.json
diff --git a/templates/contracts/javascript/yarn.lock → templates/contracts/ts/yarn.lock b/templates/contracts/javascript/yarn.lock → templates/contracts/ts/yarn.lock
diff --git a/test/__snapshots__/make.test.ts.snap b/test/__snapshots__/make.test.ts.snap
@@ -1054,11 +1054,11 @@ import { useEffect, useState } from 'react';
 import '@/app/globals.css';
 import { NearContext } from '@/context';
 import { Navigation } from '@/components/navigation';
-import { NetworkId, HelloNearContract } from '@/config';
+import { NetworkId } from '@/config';
 
 import { Wallet } from '@/wallets/near';
 
-const wallet = new Wallet({ networkId: NetworkId, createAccessKeyFor: HelloNearContract });
+const wallet = new Wallet({ networkId: NetworkId });
 
 // Layout Component
 export default function RootLayout({ children }) {
@@ -1773,9 +1773,9 @@ import { NearContext } from '@/context';
 import { Navigation } from '@/components/navigation';
 
 import { Wallet } from '@/wallets/near';
-import { NetworkId, HelloNearContract } from '@/config';
+import { NetworkId } from '@/config';
 
-const wallet = new Wallet({ createAccessKeyFor: HelloNearContract, networkId: NetworkId });
+const wallet = new Wallet({ networkId: NetworkId });
 
 export default function MyApp({ Component, pageProps }) {
   const [signedAccountId, setSignedAccountId] = useState('');