Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup DApp - Remove Unused Stuff, Reorganize Rest #88

Merged
merged 12 commits into from
Dec 6, 2024
Merged

Cleanup DApp - Remove Unused Stuff, Reorganize Rest #88

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f6720a5
chore: remove unused scripts from package.json
amessbee Nov 12, 2024
4388e69
chore: remove unused startup files
amessbee Nov 12, 2024
eecdb19
chore: clean contract/Makefile
amessbee Nov 12, 2024
15ff112
chore: relocate unused utility script
amessbee Nov 12, 2024
6411fe3
chore: update gitignore, delete duplicate copies of scripts
amessbee Nov 12, 2024
7d2a6c9
chore: relocate init script - update paths
amessbee Nov 12, 2024
1fcb5e0
chore: deleting (PROBABLY) unused files
amessbee Nov 12, 2024
35e7d93
chore: remove unused scripts
amessbee Nov 12, 2024
f2e6eaf
chore: files needed for integration
amessbee Nov 13, 2024
0443e6b
fixup! addition to package scripts
amessbee Nov 15, 2024
6dbc2d3
chore: factor out EXEC_AGD and EXEC_OSMO
amessbee Nov 21, 2024
3b12483
chore: update package.json
amessbee Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions contract/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,6 @@
"description": "Agoric Orchestration Contract",
"type": "module",
"scripts": {
"start:docker": "docker compose up -d",
"docker:logs": "docker compose logs --tail 200 -f",
"docker:bash": "docker compose exec agd bash",
Comment on lines -8 to -10
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this start:docker and docker:logs are our getting started docs, I suggest that yarn start:docker and the like should give a diagnostic about what to do instead. (Be sure to give a failing exit code.)

Or... if it's easy enough to just make docker:logs work (i.e. show the agd logs) then we should do that. (likewise docker:bash)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point.

  • start:docker now points to readme in multichain-testing to setup env
  • docker:logs now shows agd logs
  • docker:bash now opens agoriclocal-genesis-0 shell

"docker:make": "docker compose exec agd make -C /workspace/contract",
"make:help": "make list",
"start": "make clean start",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

likewise yarn start should give a clue about what to do instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yarn start now deploys contract on chain, i.e., make e2e
Updated the rest same as above.

"start2": "make clean start2",
"build2": "yarn build:deployer2",
"build:deployer": "rollup -c rollup.config.mjs",
"build:deployer2": "echo \"deployer2\"; agoric run scripts/build-contract-deployer.js",
"deploy": "make dev-working",
"test": "ava",
"lint": "tsc && eslint '**/*.js'",
"lint:fix": "eslint --fix '**/*.js'"
Expand Down
15 changes: 1 addition & 14 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,9 @@
"protobufjs@npm:^7.2.5": "patch:protobufjs@npm%3A6.11.4#~/.yarn/patches/protobufjs-npm-6.11.4-af11968b80.patch"
},
"scripts": {
"start:docker": "cd contract && docker compose up -d",
"stop:docker": "cd contract && docker compose down",
"docker:logs": "cd contract; docker compose logs --tail 200 -f",
"docker:bash": "cd contract; docker compose exec agd bash",
"docker:make": "cd contract; docker compose exec agd make -C /workspace/contract",
"make:help": "make -C contract list",
"start:contract": "cd contract && yarn start",
"integration-test": "cd contract && yarn ava ./test/orca-multichain.test.js",
"start:ui": "cd ui && yarn dev",
"format": "yarn prettier --write .github contract ui",
"lint:format": "yarn prettier --check .github contract ui",
"lint": "yarn lint:format && yarn workspaces foreach --all run lint",
"lint:fix": "yarn format && yarn workspaces foreach --all run lint:fix",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe we need to keep this

"test": "yarn workspaces foreach --all run test",
"build": "yarn workspaces foreach --all run build",
"postinstall": "npx patch-package"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure if there are any repercussions for removing this. Will let @Jovonni confirm this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mujahidkay brought them back.

"lint:format": "yarn prettier --check .github contract ui"
},
"devDependencies": {
"@types/node": "npm:20.16.8",
Expand Down
4 changes: 1 addition & 3 deletions ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
"build": "tsc && NODE_OPTIONS=--max-old-space-size=4096 vite build",
"lint": "yarn tsc && eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"lint:fix": "yarn lint --fix",
"preview": "vite preview",
"test": "exit 0",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yarn test seems like it should stay

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

"test:e2e": "exit 0"
"preview": "vite preview"
},
"dependencies": {
"@agoric/react-components": "0.2.1-dev-e6f79e0.0",
Expand Down