Merge pull request #5 from Chia-Network/20240719-clsp-move

20240719 clsp move
Chia-Network · Jul 22, 2024 · cf4720a · cf4720a
2 parents 2e8fb87 + c617bba
commit cf4720a
Show file tree

Hide file tree

Showing 113 changed files with 35 additions and 32 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.hex
diff --git a/build.rs b/build.rs
@@ -15,7 +15,10 @@ fn do_compile(title: &str, filename: &str) -> Result<(), CompileError> {
     let mut arguments: HashMap<String, ArgumentValue> = HashMap::new();
     arguments.insert(
         "include".to_string(),
-        ArgumentValue::ArgArray(vec![ArgumentValue::ArgString(None, ".".to_string())]),
+        ArgumentValue::ArgArray(vec![
+            ArgumentValue::ArgString(None, "clsp".to_string()),
+            ArgumentValue::ArgString(None, ".".to_string()),
+        ]),
     );
 
     let file_content = fs::read_to_string(filename).map_err(|e| {

diff --git a/chialisp.toml b/chialisp.toml
@@ -1,3 +1,10 @@
 [compile]
-unroll-puzzle = "resources/unroll_puzzle.clsp"
-unroll-meta-puzzle = "resources/unroll_meta_puzzle.clsp"
+unroll-puzzle = "clsp/unroll/unroll_puzzle.clsp"
+unroll-meta-puzzle = "clsp/unroll/unroll_meta_puzzle.clsp"
+calpoker-generate = "clsp/calpoker_include.clsp"
+onchain-referee = "clsp/onchain/referee.clsp"
+debug-game = "clsp/test/debug_game_handler.clsp"
+handcalc-micro = "clsp/test/test_handcalc_micro.clsp"
+make-cards = "clsp/test/test_make_cards.clsp"
+deep-compare = "clsp/test/deep_compare.clsp"
+test-mergein = "clsp/test/test_mergein.clsp"
diff --git a/calpoker_generate.clinc → clsp/calpoker_generate.clinc b/calpoker_generate.clinc → clsp/calpoker_generate.clinc
diff --git a/calpoker_include.clsp → clsp/calpoker_include.clsp b/calpoker_include.clsp → clsp/calpoker_include.clsp
diff --git a/channel_handler.clinc → clsp/channel_handler.clinc b/channel_handler.clinc → clsp/channel_handler.clinc
diff --git a/flatten.clinc → clsp/flatten.clinc b/flatten.clinc → clsp/flatten.clinc
diff --git a/handcalc.clinc → clsp/handcalc.clinc b/handcalc.clinc → clsp/handcalc.clinc
diff --git a/krunk_generate.clinc → clsp/krunk_generate.clinc b/krunk_generate.clinc → clsp/krunk_generate.clinc
diff --git a/krunk_include.clsp → clsp/krunk_include.clsp b/krunk_include.clsp → clsp/krunk_include.clsp
diff --git a/onchain/calpoker/a.clsp → clsp/onchain/calpoker/a.clsp b/onchain/calpoker/a.clsp → clsp/onchain/calpoker/a.clsp
diff --git a/onchain/calpoker/arrange_cards.clinc → clsp/onchain/calpoker/arrange_cards.clinc b/onchain/calpoker/arrange_cards.clinc → clsp/onchain/calpoker/arrange_cards.clinc
diff --git a/onchain/calpoker/b.clsp → clsp/onchain/calpoker/b.clsp b/onchain/calpoker/b.clsp → clsp/onchain/calpoker/b.clsp
diff --git a/onchain/calpoker/c.clsp → clsp/onchain/calpoker/c.clsp b/onchain/calpoker/c.clsp → clsp/onchain/calpoker/c.clsp
diff --git a/onchain/calpoker/d.clsp → clsp/onchain/calpoker/d.clsp b/onchain/calpoker/d.clsp → clsp/onchain/calpoker/d.clsp
diff --git a/onchain/calpoker/e.clsp → clsp/onchain/calpoker/e.clsp b/onchain/calpoker/e.clsp → clsp/onchain/calpoker/e.clsp
diff --git a/onchain/calpoker/flatten_card.clinc → clsp/onchain/calpoker/flatten_card.clinc b/onchain/calpoker/flatten_card.clinc → clsp/onchain/calpoker/flatten_card.clinc
diff --git a/onchain/calpoker/make_card.clinc → clsp/onchain/calpoker/make_card.clinc b/onchain/calpoker/make_card.clinc → clsp/onchain/calpoker/make_card.clinc
diff --git a/onchain/calpoker/make_cards.clinc → clsp/onchain/calpoker/make_cards.clinc b/onchain/calpoker/make_cards.clinc → clsp/onchain/calpoker/make_cards.clinc
diff --git a/onchain/calpoker/onehandcalc.clinc → clsp/onchain/calpoker/onehandcalc.clinc b/onchain/calpoker/onehandcalc.clinc → clsp/onchain/calpoker/onehandcalc.clinc
diff --git a/clsp/onchain/calpoker/test_atomsort.clsp b/clsp/onchain/calpoker/test_atomsort.clsp
@@ -0,0 +1,4 @@
+(include *standard-cl-23*)
+(import onchain.calpoker.onehandcalc exposing atomsort)
+
+(export X (atomsort X))
diff --git a/onchain/game_codes.clinc → clsp/onchain/game_codes.clinc b/onchain/game_codes.clinc → clsp/onchain/game_codes.clinc
diff --git a/onchain/krunk/clue.clsp → clsp/onchain/krunk/clue.clsp b/onchain/krunk/clue.clsp → clsp/onchain/krunk/clue.clsp
diff --git a/onchain/krunk/commit.clsp → clsp/onchain/krunk/commit.clsp b/onchain/krunk/commit.clsp → clsp/onchain/krunk/commit.clsp
diff --git a/onchain/krunk/guess.clsp → clsp/onchain/krunk/guess.clsp b/onchain/krunk/guess.clsp → clsp/onchain/krunk/guess.clsp
diff --git a/onchain/krunk/krunk_make_clue.clinc → clsp/onchain/krunk/krunk_make_clue.clinc b/onchain/krunk/krunk_make_clue.clinc → clsp/onchain/krunk/krunk_make_clue.clinc
diff --git a/onchain/poker/begin_round.clsp → clsp/onchain/poker/begin_round.clsp b/onchain/poker/begin_round.clsp → clsp/onchain/poker/begin_round.clsp
diff --git a/onchain/poker/commitA.clsp → clsp/onchain/poker/commitA.clsp b/onchain/poker/commitA.clsp → clsp/onchain/poker/commitA.clsp
diff --git a/onchain/poker/commitB.clsp → clsp/onchain/poker/commitB.clsp b/onchain/poker/commitB.clsp → clsp/onchain/poker/commitB.clsp
diff --git a/onchain/poker/end.clsp → clsp/onchain/poker/end.clsp b/onchain/poker/end.clsp → clsp/onchain/poker/end.clsp
diff --git a/onchain/poker/mid_round.clsp → clsp/onchain/poker/mid_round.clsp b/onchain/poker/mid_round.clsp → clsp/onchain/poker/mid_round.clsp
diff --git a/onchain/poker/space_hand_eval.clinc → clsp/onchain/poker/space_hand_eval.clinc b/onchain/poker/space_hand_eval.clinc → clsp/onchain/poker/space_hand_eval.clinc
diff --git a/onchain/referee.clsp → clsp/onchain/referee.clsp b/onchain/referee.clsp → clsp/onchain/referee.clsp
diff --git a/onchain/structured-referee.clsp → clsp/onchain/structured-referee.clsp b/onchain/structured-referee.clsp → clsp/onchain/structured-referee.clsp
diff --git a/prepend_count.clinc → clsp/prepend_count.clinc b/prepend_count.clinc → clsp/prepend_count.clinc
diff --git a/reduce.clinc → clsp/reduce.clinc b/reduce.clinc → clsp/reduce.clinc
diff --git a/referee_maker.clinc → clsp/referee_maker.clinc b/referee_maker.clinc → clsp/referee_maker.clinc
diff --git a/referee_maker_build.clsp → clsp/referee_maker_build.clsp b/referee_maker_build.clsp → clsp/referee_maker_build.clsp
diff --git a/signer.clinc → clsp/signer.clinc b/signer.clinc → clsp/signer.clinc
diff --git a/smoke_test_deep_compare.clsp → clsp/smoke_test_deep_compare.clsp b/smoke_test_deep_compare.clsp → clsp/smoke_test_deep_compare.clsp
diff --git a/smoke_test_permutations.clsp → clsp/smoke_test_permutations.clsp b/smoke_test_permutations.clsp → clsp/smoke_test_permutations.clsp
diff --git a/smoke_test_sort.clsp → clsp/smoke_test_sort.clsp b/smoke_test_sort.clsp → clsp/smoke_test_sort.clsp
diff --git a/space_poker.clinc → clsp/space_poker.clinc b/space_poker.clinc → clsp/space_poker.clinc
diff --git a/spacepoker_include.clsp → clsp/spacepoker_include.clsp b/spacepoker_include.clsp → clsp/spacepoker_include.clsp
diff --git a/std/all_in_list.clinc → clsp/std/all_in_list.clinc b/std/all_in_list.clinc → clsp/std/all_in_list.clinc
diff --git a/std/and.clinc → clsp/std/and.clinc b/std/and.clinc → clsp/std/and.clinc
diff --git a/std/append.clinc → clsp/std/append.clinc b/std/append.clinc → clsp/std/append.clinc
diff --git a/std/assert.clinc → clsp/std/assert.clinc b/std/assert.clinc → clsp/std/assert.clinc
diff --git a/std/atomsort.clinc → clsp/std/atomsort.clinc b/std/atomsort.clinc → clsp/std/atomsort.clinc
diff --git a/std/busy.clinc → clsp/std/busy.clinc b/std/busy.clinc → clsp/std/busy.clinc
diff --git a/std/condition_codes.clinc → clsp/std/condition_codes.clinc b/std/condition_codes.clinc → clsp/std/condition_codes.clinc
diff --git a/std/curry-and-treehash.clinc → clsp/std/curry-and-treehash.clinc b/std/curry-and-treehash.clinc → clsp/std/curry-and-treehash.clinc
diff --git a/std/curry.clinc → clsp/std/curry.clinc b/std/curry.clinc → clsp/std/curry.clinc
diff --git a/std/deep_compare.clinc → clsp/std/deep_compare.clinc b/std/deep_compare.clinc → clsp/std/deep_compare.clinc
diff --git a/std/echo.clinc → clsp/std/echo.clinc b/std/echo.clinc → clsp/std/echo.clinc
diff --git a/std/factorial.clinc → clsp/std/factorial.clinc b/std/factorial.clinc → clsp/std/factorial.clinc
diff --git a/std/filtermap.clinc → clsp/std/filtermap.clinc b/std/filtermap.clinc → clsp/std/filtermap.clinc
diff --git a/std/if_any_fail.clinc → clsp/std/if_any_fail.clinc b/std/if_any_fail.clinc → clsp/std/if_any_fail.clinc
diff --git a/std/isthere.clinc → clsp/std/isthere.clinc b/std/isthere.clinc → clsp/std/isthere.clinc
diff --git a/std/last.clinc → clsp/std/last.clinc b/std/last.clinc → clsp/std/last.clinc
diff --git a/std/len.clinc → clsp/std/len.clinc b/std/len.clinc → clsp/std/len.clinc
diff --git a/std/li.clinc → clsp/std/li.clinc b/std/li.clinc → clsp/std/li.clinc
diff --git a/std/list_compare.clinc → clsp/std/list_compare.clinc b/std/list_compare.clinc → clsp/std/list_compare.clinc
diff --git a/std/map.clinc → clsp/std/map.clinc b/std/map.clinc → clsp/std/map.clinc
diff --git a/std/match.clinc → clsp/std/match.clinc b/std/match.clinc → clsp/std/match.clinc
diff --git a/std/max.clinc → clsp/std/max.clinc b/std/max.clinc → clsp/std/max.clinc
diff --git a/std/partition.clinc → clsp/std/partition.clinc b/std/partition.clinc → clsp/std/partition.clinc
diff --git a/std/permutations.clinc → clsp/std/permutations.clinc b/std/permutations.clinc → clsp/std/permutations.clinc
diff --git a/std/popcount.clinc → clsp/std/popcount.clinc b/std/popcount.clinc → clsp/std/popcount.clinc
diff --git a/std/prefix.clinc → clsp/std/prefix.clinc b/std/prefix.clinc → clsp/std/prefix.clinc
diff --git a/std/prelude.clinc → clsp/std/prelude.clinc b/std/prelude.clinc → clsp/std/prelude.clinc
diff --git a/std/prepend.clinc → clsp/std/prepend.clinc b/std/prepend.clinc → clsp/std/prepend.clinc
diff --git a/std/print.clinc → clsp/std/print.clinc b/std/print.clinc → clsp/std/print.clinc
diff --git a/std/range.clinc → clsp/std/range.clinc b/std/range.clinc → clsp/std/range.clinc
diff --git a/std/relops.clinc → clsp/std/relops.clinc b/std/relops.clinc → clsp/std/relops.clinc
diff --git a/std/reverse.clinc → clsp/std/reverse.clinc b/std/reverse.clinc → clsp/std/reverse.clinc
diff --git a/std/run.clinc → clsp/std/run.clinc b/std/run.clinc → clsp/std/run.clinc
diff --git a/std/shatree.clinc → clsp/std/shatree.clinc b/std/shatree.clinc → clsp/std/shatree.clinc
diff --git a/std/slice.clinc → clsp/std/slice.clinc b/std/slice.clinc → clsp/std/slice.clinc
diff --git a/std/sort.clinc → clsp/std/sort.clinc b/std/sort.clinc → clsp/std/sort.clinc
diff --git a/std/truncate.clinc → clsp/std/truncate.clinc b/std/truncate.clinc → clsp/std/truncate.clinc
diff --git a/resources/debug_game_handler.clsp → clsp/test/debug_game_handler.clsp b/resources/debug_game_handler.clsp → clsp/test/debug_game_handler.clsp
@@ -102,7 +102,6 @@
    ;; Validation info
    validation_info readable_new_move
 
-   state_hash (shatree state)
    other_turn (curried_other_turn CURRIED)
 
    program-hash

diff --git a/resources/deep_compare.clsp → clsp/test/deep_compare.clsp b/resources/deep_compare.clsp → clsp/test/deep_compare.clsp
diff --git a/resources/test_handcalc_micro.clsp → clsp/test/test_handcalc_micro.clsp b/resources/test_handcalc_micro.clsp → clsp/test/test_handcalc_micro.clsp
diff --git a/resources/test_make_cards.clsp → clsp/test/test_make_cards.clsp b/resources/test_make_cards.clsp → clsp/test/test_make_cards.clsp
diff --git a/resources/test_map_enumerate.clsp → clsp/test/test_map_enumerate.clsp b/resources/test_map_enumerate.clsp → clsp/test/test_map_enumerate.clsp
diff --git a/resources/test_mergein.clsp → clsp/test/test_mergein.clsp b/resources/test_mergein.clsp → clsp/test/test_mergein.clsp
diff --git a/test_handcalc.clsp → clsp/test/unused/test_handcalc.clsp b/test_handcalc.clsp → clsp/test/unused/test_handcalc.clsp
diff --git a/test_onehandcalc.clsp → clsp/test/unused/test_onehandcalc.clsp b/test_onehandcalc.clsp → clsp/test/unused/test_onehandcalc.clsp
diff --git a/test_permutations.clsp → clsp/test/unused/test_permutations.clsp b/test_permutations.clsp → clsp/test/unused/test_permutations.clsp
diff --git a/test_prepend.clsp → clsp/test/unused/test_prepend.clsp b/test_prepend.clsp → clsp/test/unused/test_prepend.clsp
diff --git a/test_range.clsp → clsp/test/unused/test_range.clsp b/test_range.clsp → clsp/test/unused/test_range.clsp
diff --git a/test_reverse.clsp → clsp/test/unused/test_reverse.clsp b/test_reverse.clsp → clsp/test/unused/test_reverse.clsp
diff --git a/test_sort.clsp → clsp/test/unused/test_sort.clsp b/test_sort.clsp → clsp/test/unused/test_sort.clsp
diff --git a/resources/unroll_meta_puzzle.clsp → clsp/unroll/unroll_meta_puzzle.clsp b/resources/unroll_meta_puzzle.clsp → clsp/unroll/unroll_meta_puzzle.clsp
diff --git a/resources/unroll_puzzle.clsp → clsp/unroll/unroll_puzzle.clsp b/resources/unroll_puzzle.clsp → clsp/unroll/unroll_puzzle.clsp
diff --git a/utils.clinc → clsp/utils.clinc b/utils.clinc → clsp/utils.clinc
diff --git a/onchain/referee.hex b/onchain/referee.hex
diff --git a/resources/calpoker_include_calpoker_template.hex b/resources/calpoker_include_calpoker_template.hex
diff --git a/resources/debug_game_handler.hex b/resources/debug_game_handler.hex
diff --git a/resources/deep_compare.hex b/resources/deep_compare.hex
diff --git a/resources/default_hidden_puzzle.hex b/resources/default_hidden_puzzle.hex