GitBross Startsida Utforska Hjälp
Registrera dig Logga in
sol_87yf6cwp
/
solana-token-program
spegling av https://github.com/solana-program/token
1
0
Fork 0
Filer Ärenden 0 Wiki
Bläddra i källkod

Move pinocchio crates into subdirectory (#100)

#### Problem

The Makefile model uses a slightly hacky way of distinguishing
subdirectories, where anything before the first `-` is taken to be a
directory name. This is a problem for `p-token` and `p-interface`, since
the Makefile will look in `p/token` and `p/interface`.

#### Summary of changes

Move p-token into pinocchio/program and p-interface into
pinocchio/interface.

Update everything else as needed.
Jon C 1 månad sedan
förälder
998ad67a01
incheckning
4436a38b01
87 ändrade filer med 10 tillägg och 10 borttagningar
Delad Vy Visa Diff Statistik
  1. 2 2
      .github/workflows/publish-rust.yml
  2. 1 1
      Cargo.toml
  3. 6 6
      package.json
  4. 0 0
      pinocchio/interface/Cargo.toml
  5. 0 0
      pinocchio/interface/README.md
  6. 0 0
      pinocchio/interface/src/error.rs
  7. 0 0
      pinocchio/interface/src/instruction.rs
  8. 0 0
      pinocchio/interface/src/lib.rs
  9. 0 0
      pinocchio/interface/src/native_mint.rs
  10. 0 0
      pinocchio/interface/src/state/account.rs
  11. 0 0
      pinocchio/interface/src/state/account_state.rs
  12. 0 0
      pinocchio/interface/src/state/mint.rs
  13. 0 0
      pinocchio/interface/src/state/mod.rs
  14. 0 0
      pinocchio/interface/src/state/multisig.rs
  15. 1 1
      pinocchio/program/Cargo.toml
  16. 0 0
      pinocchio/program/README.md
  17. 0 0
      pinocchio/program/src/entrypoint.rs
  18. 0 0
      pinocchio/program/src/lib.rs
  19. 0 0
      pinocchio/program/src/processor/amount_to_ui_amount.rs
  20. 0 0
      pinocchio/program/src/processor/approve.rs
  21. 0 0
      pinocchio/program/src/processor/approve_checked.rs
  22. 0 0
      pinocchio/program/src/processor/batch.rs
  23. 0 0
      pinocchio/program/src/processor/burn.rs
  24. 0 0
      pinocchio/program/src/processor/burn_checked.rs
  25. 0 0
      pinocchio/program/src/processor/close_account.rs
  26. 0 0
      pinocchio/program/src/processor/freeze_account.rs
  27. 0 0
      pinocchio/program/src/processor/get_account_data_size.rs
  28. 0 0
      pinocchio/program/src/processor/initialize_account.rs
  29. 0 0
      pinocchio/program/src/processor/initialize_account2.rs
  30. 0 0
      pinocchio/program/src/processor/initialize_account3.rs
  31. 0 0
      pinocchio/program/src/processor/initialize_immutable_owner.rs
  32. 0 0
      pinocchio/program/src/processor/initialize_mint.rs
  33. 0 0
      pinocchio/program/src/processor/initialize_mint2.rs
  34. 0 0
      pinocchio/program/src/processor/initialize_multisig.rs
  35. 0 0
      pinocchio/program/src/processor/initialize_multisig2.rs
  36. 0 0
      pinocchio/program/src/processor/mint_to.rs
  37. 0 0
      pinocchio/program/src/processor/mint_to_checked.rs
  38. 0 0
      pinocchio/program/src/processor/mod.rs
  39. 0 0
      pinocchio/program/src/processor/revoke.rs
  40. 0 0
      pinocchio/program/src/processor/set_authority.rs
  41. 0 0
      pinocchio/program/src/processor/shared/approve.rs
  42. 0 0
      pinocchio/program/src/processor/shared/burn.rs
  43. 0 0
      pinocchio/program/src/processor/shared/initialize_account.rs
  44. 0 0
      pinocchio/program/src/processor/shared/initialize_mint.rs
  45. 0 0
      pinocchio/program/src/processor/shared/initialize_multisig.rs
  46. 0 0
      pinocchio/program/src/processor/shared/mint_to.rs
  47. 0 0
      pinocchio/program/src/processor/shared/mod.rs
  48. 0 0
      pinocchio/program/src/processor/shared/toggle_account_state.rs
  49. 0 0
      pinocchio/program/src/processor/shared/transfer.rs
  50. 0 0
      pinocchio/program/src/processor/sync_native.rs
  51. 0 0
      pinocchio/program/src/processor/thaw_account.rs
  52. 0 0
      pinocchio/program/src/processor/transfer.rs
  53. 0 0
      pinocchio/program/src/processor/transfer_checked.rs
  54. 0 0
      pinocchio/program/src/processor/ui_amount_to_amount.rs
  55. 0 0
      pinocchio/program/src/processor/unwrap_lamports.rs
  56. 0 0
      pinocchio/program/src/processor/withdraw_excess_lamports.rs
  57. 0 0
      pinocchio/program/tests/amount_to_ui_amount.rs
  58. 0 0
      pinocchio/program/tests/approve.rs
  59. 0 0
      pinocchio/program/tests/approve_checked.rs
  60. 0 0
      pinocchio/program/tests/batch.rs
  61. 0 0
      pinocchio/program/tests/burn.rs
  62. 0 0
      pinocchio/program/tests/burn_checked.rs
  63. 0 0
      pinocchio/program/tests/close_account.rs
  64. 0 0
      pinocchio/program/tests/freeze_account.rs
  65. 0 0
      pinocchio/program/tests/initialize_account.rs
  66. 0 0
      pinocchio/program/tests/initialize_account2.rs
  67. 0 0
      pinocchio/program/tests/initialize_account3.rs
  68. 0 0
      pinocchio/program/tests/initialize_immutable_owner.rs
  69. 0 0
      pinocchio/program/tests/initialize_mint.rs
  70. 0 0
      pinocchio/program/tests/initialize_mint2.rs
  71. 0 0
      pinocchio/program/tests/initialize_multisig.rs
  72. 0 0
      pinocchio/program/tests/initialize_multisig2.rs
  73. 0 0
      pinocchio/program/tests/mint_to.rs
  74. 0 0
      pinocchio/program/tests/mint_to_checked.rs
  75. 0 0
      pinocchio/program/tests/revoke.rs
  76. 0 0
      pinocchio/program/tests/set_authority.rs
  77. 0 0
      pinocchio/program/tests/setup/account.rs
  78. 0 0
      pinocchio/program/tests/setup/mint.rs
  79. 0 0
      pinocchio/program/tests/setup/mod.rs
  80. 0 0
      pinocchio/program/tests/setup/mollusk.rs
  81. 0 0
      pinocchio/program/tests/sync_native.rs
  82. 0 0
      pinocchio/program/tests/thaw_account.rs
  83. 0 0
      pinocchio/program/tests/transfer.rs
  84. 0 0
      pinocchio/program/tests/transfer_checked.rs
  85. 0 0
      pinocchio/program/tests/ui_amount_to_amount.rs
  86. 0 0
      pinocchio/program/tests/unwrap_lamports.rs
  87. 0 0
      pinocchio/program/tests/withdraw_excess_lamports.rs

+ 2 - 2
.github/workflows/publish-rust.yml
Visa fil 

@@ -11,9 +11,9 @@ on:
 
         options:
 
           - clients/rust
 
           - interface
 
-          - p-interface
 
+          - pinocchio/interface
 
+          - pinocchio/program
 
           - program
 
-          - p-token
 
       level:
 
         description: Level
 
         required: true

+ 1 - 1
Cargo.toml
Visa fil 

@@ -1,6 +1,6 @@
 
 [workspace]
 
 resolver = "2"
 
-members = ["interface", "p-interface", "p-token", "program"]
 
+members = ["interface", "pinocchio/interface", "pinocchio/program", "program"]
 
 
 [workspace.package]
 
 authors = ["Anza Maintainers <maintainers@anza.xyz>"]

+ 6 - 6
package.json
Visa fil 

@@ -24,15 +24,15 @@
 
     "rust:audit": "zx ./scripts/rust/audit.mjs",
 
     "rust:publish": "zx ./scripts/rust/publish.mjs",
 
     "rust:semver": "cargo semver-checks",
 
-    "p-token:build": "zx ./scripts/rust/build-sbf.mjs p-token",
 
-    "p-token:format": "zx ./scripts/rust/format.mjs p-token",
 
-    "p-token:lint": "zx ./scripts/rust/lint.mjs p-token",
 
-    "p-token:test": "zx ./scripts/rust/test.mjs p-token",
 
+    "p-token:build": "zx ./scripts/rust/build-sbf.mjs pinocchio/program",
 
+    "p-token:format": "zx ./scripts/rust/format.mjs pinocchio/program",
 
+    "p-token:lint": "zx ./scripts/rust/lint.mjs pinocchio/program",
 
+    "p-token:test": "zx ./scripts/rust/test.mjs pinocchio/program",
 
     "fixtures:clean": "zx ./scripts/rust/fixtures.mjs clean",
 
     "fixtures:generate": "zx ./scripts/rust/fixtures.mjs generate",
 
     "fixtures:run": "zx ./scripts/rust/fixtures.mjs run",
 
-    "p-interface:format": "zx ./scripts/rust/format.mjs p-interface",
 
-    "p-interface:lint": "zx ./scripts/rust/lint.mjs p-interface",
 
+    "p-interface:format": "zx ./scripts/rust/format.mjs pinocchio/interface",
 
+    "p-interface:lint": "zx ./scripts/rust/lint.mjs pinocchio/interface",
 
     "interface:format": "zx ./scripts/rust/format.mjs interface",
 
     "interface:lint": "zx ./scripts/rust/lint.mjs interface",
 
     "interface:test": "zx ./scripts/rust/test.mjs interface"

+ 0 - 0
p-interface/Cargo.toml → pinocchio/interface/Cargo.toml
Visa fil


+ 0 - 0
p-interface/README.md → pinocchio/interface/README.md
Visa fil


+ 0 - 0
p-interface/src/error.rs → pinocchio/interface/src/error.rs
Visa fil


+ 0 - 0
p-interface/src/instruction.rs → pinocchio/interface/src/instruction.rs
Visa fil


+ 0 - 0
p-interface/src/lib.rs → pinocchio/interface/src/lib.rs
Visa fil


+ 0 - 0
p-interface/src/native_mint.rs → pinocchio/interface/src/native_mint.rs
Visa fil


+ 0 - 0
p-interface/src/state/account.rs → pinocchio/interface/src/state/account.rs
Visa fil


+ 0 - 0
p-interface/src/state/account_state.rs → pinocchio/interface/src/state/account_state.rs
Visa fil


+ 0 - 0
p-interface/src/state/mint.rs → pinocchio/interface/src/state/mint.rs
Visa fil


+ 0 - 0
p-interface/src/state/mod.rs → pinocchio/interface/src/state/mod.rs
Visa fil


+ 0 - 0
p-interface/src/state/multisig.rs → pinocchio/interface/src/state/multisig.rs
Visa fil


+ 1 - 1
p-token/Cargo.toml → pinocchio/program/Cargo.toml
Visa fil 

@@ -17,7 +17,7 @@ logging = []
 
 [dependencies]
 
 pinocchio = { workspace = true }
 
 pinocchio-log = { version = "0.5.1", default-features = false }
 
-pinocchio-token-interface = { version = "^0", path = "../p-interface" }
 
+pinocchio-token-interface = { version = "^0", path = "../interface" }
 
 
 [dev-dependencies]
 
 agave-feature-set = "2.2.20"

+ 0 - 0
p-token/README.md → pinocchio/program/README.md
Visa fil


+ 0 - 0
p-token/src/entrypoint.rs → pinocchio/program/src/entrypoint.rs
Visa fil


+ 0 - 0
p-token/src/lib.rs → pinocchio/program/src/lib.rs
Visa fil


+ 0 - 0
p-token/src/processor/amount_to_ui_amount.rs → pinocchio/program/src/processor/amount_to_ui_amount.rs
Visa fil


+ 0 - 0
p-token/src/processor/approve.rs → pinocchio/program/src/processor/approve.rs
Visa fil


+ 0 - 0
p-token/src/processor/approve_checked.rs → pinocchio/program/src/processor/approve_checked.rs
Visa fil


+ 0 - 0
p-token/src/processor/batch.rs → pinocchio/program/src/processor/batch.rs
Visa fil


+ 0 - 0
p-token/src/processor/burn.rs → pinocchio/program/src/processor/burn.rs
Visa fil


+ 0 - 0
p-token/src/processor/burn_checked.rs → pinocchio/program/src/processor/burn_checked.rs
Visa fil


+ 0 - 0
p-token/src/processor/close_account.rs → pinocchio/program/src/processor/close_account.rs
Visa fil


+ 0 - 0
p-token/src/processor/freeze_account.rs → pinocchio/program/src/processor/freeze_account.rs
Visa fil


+ 0 - 0
p-token/src/processor/get_account_data_size.rs → pinocchio/program/src/processor/get_account_data_size.rs
Visa fil


+ 0 - 0
p-token/src/processor/initialize_account.rs → pinocchio/program/src/processor/initialize_account.rs
Visa fil


+ 0 - 0
p-token/src/processor/initialize_account2.rs → pinocchio/program/src/processor/initialize_account2.rs
Visa fil


+ 0 - 0
p-token/src/processor/initialize_account3.rs → pinocchio/program/src/processor/initialize_account3.rs
Visa fil


+ 0 - 0
p-token/src/processor/initialize_immutable_owner.rs → pinocchio/program/src/processor/initialize_immutable_owner.rs
Visa fil


+ 0 - 0
p-token/src/processor/initialize_mint.rs → pinocchio/program/src/processor/initialize_mint.rs
Visa fil


+ 0 - 0
p-token/src/processor/initialize_mint2.rs → pinocchio/program/src/processor/initialize_mint2.rs
Visa fil


+ 0 - 0
p-token/src/processor/initialize_multisig.rs → pinocchio/program/src/processor/initialize_multisig.rs
Visa fil


+ 0 - 0
p-token/src/processor/initialize_multisig2.rs → pinocchio/program/src/processor/initialize_multisig2.rs
Visa fil


+ 0 - 0
p-token/src/processor/mint_to.rs → pinocchio/program/src/processor/mint_to.rs
Visa fil


+ 0 - 0
p-token/src/processor/mint_to_checked.rs → pinocchio/program/src/processor/mint_to_checked.rs
Visa fil


+ 0 - 0
p-token/src/processor/mod.rs → pinocchio/program/src/processor/mod.rs
Visa fil


+ 0 - 0
p-token/src/processor/revoke.rs → pinocchio/program/src/processor/revoke.rs
Visa fil


+ 0 - 0
p-token/src/processor/set_authority.rs → pinocchio/program/src/processor/set_authority.rs
Visa fil


+ 0 - 0
p-token/src/processor/shared/approve.rs → pinocchio/program/src/processor/shared/approve.rs
Visa fil


+ 0 - 0
p-token/src/processor/shared/burn.rs → pinocchio/program/src/processor/shared/burn.rs
Visa fil


+ 0 - 0
p-token/src/processor/shared/initialize_account.rs → pinocchio/program/src/processor/shared/initialize_account.rs
Visa fil


+ 0 - 0
p-token/src/processor/shared/initialize_mint.rs → pinocchio/program/src/processor/shared/initialize_mint.rs
Visa fil


+ 0 - 0
p-token/src/processor/shared/initialize_multisig.rs → pinocchio/program/src/processor/shared/initialize_multisig.rs
Visa fil


+ 0 - 0
p-token/src/processor/shared/mint_to.rs → pinocchio/program/src/processor/shared/mint_to.rs
Visa fil


+ 0 - 0
p-token/src/processor/shared/mod.rs → pinocchio/program/src/processor/shared/mod.rs
Visa fil


+ 0 - 0
p-token/src/processor/shared/toggle_account_state.rs → pinocchio/program/src/processor/shared/toggle_account_state.rs
Visa fil


+ 0 - 0
p-token/src/processor/shared/transfer.rs → pinocchio/program/src/processor/shared/transfer.rs
Visa fil


+ 0 - 0
p-token/src/processor/sync_native.rs → pinocchio/program/src/processor/sync_native.rs
Visa fil


+ 0 - 0
p-token/src/processor/thaw_account.rs → pinocchio/program/src/processor/thaw_account.rs
Visa fil


+ 0 - 0
p-token/src/processor/transfer.rs → pinocchio/program/src/processor/transfer.rs
Visa fil


+ 0 - 0
p-token/src/processor/transfer_checked.rs → pinocchio/program/src/processor/transfer_checked.rs
Visa fil


+ 0 - 0
p-token/src/processor/ui_amount_to_amount.rs → pinocchio/program/src/processor/ui_amount_to_amount.rs
Visa fil


+ 0 - 0
p-token/src/processor/unwrap_lamports.rs → pinocchio/program/src/processor/unwrap_lamports.rs
Visa fil


+ 0 - 0
p-token/src/processor/withdraw_excess_lamports.rs → pinocchio/program/src/processor/withdraw_excess_lamports.rs
Visa fil


+ 0 - 0
p-token/tests/amount_to_ui_amount.rs → pinocchio/program/tests/amount_to_ui_amount.rs
Visa fil


+ 0 - 0
p-token/tests/approve.rs → pinocchio/program/tests/approve.rs
Visa fil


+ 0 - 0
p-token/tests/approve_checked.rs → pinocchio/program/tests/approve_checked.rs
Visa fil


+ 0 - 0
p-token/tests/batch.rs → pinocchio/program/tests/batch.rs
Visa fil


+ 0 - 0
p-token/tests/burn.rs → pinocchio/program/tests/burn.rs
Visa fil


+ 0 - 0
p-token/tests/burn_checked.rs → pinocchio/program/tests/burn_checked.rs
Visa fil


+ 0 - 0
p-token/tests/close_account.rs → pinocchio/program/tests/close_account.rs
Visa fil


+ 0 - 0
p-token/tests/freeze_account.rs → pinocchio/program/tests/freeze_account.rs
Visa fil


+ 0 - 0
p-token/tests/initialize_account.rs → pinocchio/program/tests/initialize_account.rs
Visa fil


+ 0 - 0
p-token/tests/initialize_account2.rs → pinocchio/program/tests/initialize_account2.rs
Visa fil


+ 0 - 0
p-token/tests/initialize_account3.rs → pinocchio/program/tests/initialize_account3.rs
Visa fil


+ 0 - 0
p-token/tests/initialize_immutable_owner.rs → pinocchio/program/tests/initialize_immutable_owner.rs
Visa fil


+ 0 - 0
p-token/tests/initialize_mint.rs → pinocchio/program/tests/initialize_mint.rs
Visa fil


+ 0 - 0
p-token/tests/initialize_mint2.rs → pinocchio/program/tests/initialize_mint2.rs
Visa fil


+ 0 - 0
p-token/tests/initialize_multisig.rs → pinocchio/program/tests/initialize_multisig.rs
Visa fil


+ 0 - 0
p-token/tests/initialize_multisig2.rs → pinocchio/program/tests/initialize_multisig2.rs
Visa fil


+ 0 - 0
p-token/tests/mint_to.rs → pinocchio/program/tests/mint_to.rs
Visa fil


+ 0 - 0
p-token/tests/mint_to_checked.rs → pinocchio/program/tests/mint_to_checked.rs
Visa fil


+ 0 - 0
p-token/tests/revoke.rs → pinocchio/program/tests/revoke.rs
Visa fil


+ 0 - 0
p-token/tests/set_authority.rs → pinocchio/program/tests/set_authority.rs
Visa fil


+ 0 - 0
p-token/tests/setup/account.rs → pinocchio/program/tests/setup/account.rs
Visa fil


+ 0 - 0
p-token/tests/setup/mint.rs → pinocchio/program/tests/setup/mint.rs
Visa fil


+ 0 - 0
p-token/tests/setup/mod.rs → pinocchio/program/tests/setup/mod.rs
Visa fil


+ 0 - 0
p-token/tests/setup/mollusk.rs → pinocchio/program/tests/setup/mollusk.rs
Visa fil


+ 0 - 0
p-token/tests/sync_native.rs → pinocchio/program/tests/sync_native.rs
Visa fil


+ 0 - 0
p-token/tests/thaw_account.rs → pinocchio/program/tests/thaw_account.rs
Visa fil


+ 0 - 0
p-token/tests/transfer.rs → pinocchio/program/tests/transfer.rs
Visa fil


+ 0 - 0
p-token/tests/transfer_checked.rs → pinocchio/program/tests/transfer_checked.rs
Visa fil


+ 0 - 0
p-token/tests/ui_amount_to_amount.rs → pinocchio/program/tests/ui_amount_to_amount.rs
Visa fil


+ 0 - 0
p-token/tests/unwrap_lamports.rs → pinocchio/program/tests/unwrap_lamports.rs
Visa fil


+ 0 - 0
p-token/tests/withdraw_excess_lamports.rs → pinocchio/program/tests/withdraw_excess_lamports.rs
Visa fil