From d65418209569629a359bba79bc3a03198ed41e73 Mon Sep 17 00:00:00 2001 From: collin <16715212+collinc97@users.noreply.github.com> Date: Tue, 8 Aug 2023 11:02:42 -0700 Subject: [PATCH] commit example files --- Cargo.toml | 13 +++++++++++- leo/cli/commands/example.rs | 34 ++++++++++++++++++++++-------- leo/package/src/example.rs | 42 ------------------------------------- 3 files changed, 37 insertions(+), 52 deletions(-) delete mode 100644 leo/package/src/example.rs diff --git a/Cargo.toml b/Cargo.toml index 98aaba8ddf..f9508ba120 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,18 @@ keywords = [ "zero-knowledge" ] categories = [ "compilers", "cryptography", "web-programming" ] -include = [ "Cargo.toml", "leo", "README.md", "LICENSE.md" ] +include = [ + "Cargo.toml", + "leo", + "README.md", + "LICENSE.md", + "examples/lottery/inputs/lottery.in", + "examples/lottery/src/main.leo", + "examples/tictactoe/inputs/tictactoe.in", + "examples/tictactoe/src/main.leo", + "examples/token/inputs/token.in", + "examples/token/src/main.leo", +] license = "GPL-3.0" edition = "2021" diff --git a/leo/cli/commands/example.rs b/leo/cli/commands/example.rs index 6a288c47e2..6b9f6eca26 100644 --- a/leo/cli/commands/example.rs +++ b/leo/cli/commands/example.rs @@ -78,25 +78,41 @@ impl Example { fn main_file_string(&self) -> String { match self { - Self::Lottery => include_str!("../../../examples/lottery/src/main.leo").to_string(), - Self::TicTacToe => include_str!("../../../examples/tictactoe/src/main.leo").to_string(), - Self::Token => include_str!("../../../examples/token/src/main.leo").to_string(), + Self::Lottery => { + include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/examples/lottery/src/main.leo")).to_string() + } + Self::TicTacToe => { + include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/examples/tictactoe/src/main.leo")).to_string() + } + Self::Token => { + include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/examples/token/src/main.leo")).to_string() + } } } fn input_file_string(&self) -> String { match self { - Self::Lottery => include_str!("../../../examples/lottery/inputs/lottery.in").to_string(), - Self::TicTacToe => include_str!("../../../examples/tictactoe/inputs/tictactoe.in").to_string(), - Self::Token => include_str!("../../../examples/token/inputs/token.in").to_string(), + Self::Lottery => { + include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/examples/lottery/inputs/lottery.in")).to_string() + } + Self::TicTacToe => { + include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/examples/tictactoe/inputs/tictactoe.in")).to_string() + } + Self::Token => { + include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/examples/token/inputs/token.in")).to_string() + } } } fn readme_file_string(&self) -> String { match self { - Self::Lottery => include_str!("../../../examples/lottery/README.md").to_string(), - Self::TicTacToe => include_str!("../../../examples/tictactoe/README.md").to_string(), - Self::Token => include_str!("../../../examples/token/README.md").to_string(), + Self::Lottery => { + include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/examples/lottery/README.md")).to_string() + } + Self::TicTacToe => { + include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/examples/tictactoe/README.md")).to_string() + } + Self::Token => include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/examples/token/README.md")).to_string(), } } } diff --git a/leo/package/src/example.rs b/leo/package/src/example.rs deleted file mode 100644 index da4d4fe3a8..0000000000 --- a/leo/package/src/example.rs +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (C) 2019-2023 Aleo Systems Inc. -// This file is part of the Leo library. - -// The Leo library is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// The Leo library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with the Leo library. If not, see . - -use super::*; - -/// The example programs that can be generated. -pub enum Example { - Lottery, - TicTacToe, - Token, -} - -impl Example { - pub fn main_file_string(&self, package_name: &str) -> String { - match self { - Self::Lottery => include_str!("../../examples/lottery/src/main.leo").to_string(), - Self::TicTacToe => include_str!("../../examples/tic_tac_toe/src/main.leo").to_string(), - Self::Token => include_str!("../../examples/token/src/main.leo").to_string(), - } - } - - pub fn input_file_string(&self, package_name: &str) -> String { - match self { - Self::Lottery => include_str!("../../examples/lottery/inputs/input.in").to_string(), - Self::TicTacToe => include_str!("../../examples/tic_tac_toe/inputs/input.in").to_string(), - Self::Token => include_str!("../../examples/token/inputs/input.in").to_string(), - } - } -}