make crowdfunding contracts standalone chapters

NethermindEth · Jun 12, 2024 · 0bce989 · 0bce989
1 parent 931250e
commit 0bce989
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 32 deletions.
diff --git a/Scarb.lock b/Scarb.lock
@@ -1,10 +1,20 @@
 # Code generated by scarb DO NOT EDIT.
 version = 1
 
+[[package]]
+name = "advanced_factory"
+version = "0.1.0"
+dependencies = [
+ "alexandria_storage",
+ "components",
+ "crowdfunding",
+ "snforge_std",
+]
+
 [[package]]
 name = "alexandria_storage"
 version = "0.3.0"
-source = "git+https://github.com/keep-starknet-strange/alexandria.git#3041887b95cf10f9d3cd8d75326c754b331f9573"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=800f5ad#800f5ad217847b5ded63c0302a444161766ee9d6"
 
 [[package]]
 name = "bytearray"
@@ -18,25 +28,6 @@ version = "0.1.0"
 name = "calling_other_contracts"
 version = "0.1.0"
 
-[[package]]
-name = "campaign"
-version = "0.1.0"
-dependencies = [
- "components",
- "openzeppelin",
- "snforge_std",
-]
-
-[[package]]
-name = "campaign_factory"
-version = "0.1.0"
-dependencies = [
- "alexandria_storage",
- "campaign",
- "components",
- "snforge_std",
-]
-
 [[package]]
 name = "components"
 version = "0.1.0"
@@ -63,6 +54,15 @@ version = "0.1.0"
 name = "counter"
 version = "0.1.0"
 
+[[package]]
+name = "crowdfunding"
+version = "0.1.0"
+dependencies = [
+ "components",
+ "openzeppelin",
+ "snforge_std",
+]
+
 [[package]]
 name = "custom_type_serde"
 version = "0.1.0"

diff --git a/...ications/crowdfunding_campaign/.gitignore → .../applications/advanced_factory/.gitignore b/...ications/crowdfunding_campaign/.gitignore → .../applications/advanced_factory/.gitignore
diff --git a/...lications/crowdfunding_factory/Scarb.toml → .../applications/advanced_factory/Scarb.toml b/...lications/crowdfunding_factory/Scarb.toml → .../applications/advanced_factory/Scarb.toml
@@ -1,5 +1,5 @@
 [package]
-name = "crowdfunding_factory"
+name = "advanced_factory"
 version.workspace = true
 edition = "2023_11"
 
@@ -8,11 +8,11 @@ starknet.workspace = true
 components.workspace = true
 alexandria_storage.workspace = true
 snforge_std.workspace = true
-crowdfunding_campaign = { path = "../crowdfunding_campaign" }
+crowdfunding = { path = "../crowdfunding" }
 
 [scripts]
 test.workspace = true
 
 [[target.starknet-contract]]
 casm = true
-build-external-contracts = ["crowdfunding_campaign::campaign::Campaign"]
+build-external-contracts = ["crowdfunding::campaign::Campaign"]
diff --git a/...s/crowdfunding_factory/src/contract.cairo → ...tions/advanced_factory/src/contract.cairo b/...s/crowdfunding_factory/src/contract.cairo → ...tions/advanced_factory/src/contract.cairo
@@ -23,7 +23,7 @@ pub mod CampaignFactory {
         get_caller_address, get_contract_address
     };
     use alexandria_storage::list::{List, ListTrait};
-    use crowdfunding_campaign::campaign::{ICampaignDispatcher, ICampaignDispatcherTrait};
+    use crowdfunding::campaign::{ICampaignDispatcher, ICampaignDispatcherTrait};
     use components::ownable::ownable_component;
 
     component!(path: ownable_component, storage: ownable, event: OwnableEvent);

diff --git a/...ations/crowdfunding_factory/src/lib.cairo → ...plications/advanced_factory/src/lib.cairo b/...ations/crowdfunding_factory/src/lib.cairo → ...plications/advanced_factory/src/lib.cairo
diff --git a/...wdfunding_campaign/src/mock_upgrade.cairo → ...s/advanced_factory/src/mock_upgrade.cairo b/...wdfunding_campaign/src/mock_upgrade.cairo → ...s/advanced_factory/src/mock_upgrade.cairo
diff --git a/...ions/crowdfunding_factory/src/tests.cairo → ...ications/advanced_factory/src/tests.cairo b/...ions/crowdfunding_factory/src/tests.cairo → ...ications/advanced_factory/src/tests.cairo
@@ -1,7 +1,7 @@
 use core::traits::TryInto;
 use core::clone::Clone;
 use core::result::ResultTrait;
-use crowdfunding_factory::contract::{
+use advanced_factory::contract::{
     CampaignFactory, ICampaignFactoryDispatcher, ICampaignFactoryDispatcherTrait
 };
 use starknet::{
@@ -13,8 +13,8 @@ use snforge_std::{
 };
 
 // Define a target contract to deploy
-use crowdfunding_campaign::campaign::{Campaign, ICampaignDispatcher, ICampaignDispatcherTrait};
-use crowdfunding_campaign::campaign::Status;
+use crowdfunding::campaign::{Campaign, ICampaignDispatcher, ICampaignDispatcherTrait};
+use crowdfunding::campaign::Status;
 use components::ownable::{IOwnableDispatcher, IOwnableDispatcherTrait};
 
 

diff --git a/...lications/crowdfunding_factory/.gitignore → ...ings/applications/crowdfunding/.gitignore b/...lications/crowdfunding_factory/.gitignore → ...ings/applications/crowdfunding/.gitignore
diff --git a/...ications/crowdfunding_campaign/Scarb.toml → ...ings/applications/crowdfunding/Scarb.toml b/...ications/crowdfunding_campaign/Scarb.toml → ...ings/applications/crowdfunding/Scarb.toml
@@ -1,5 +1,5 @@
 [package]
-name = "crowdfunding_campaign"
+name = "crowdfunding"
 version.workspace = true
 edition = "2023_11"
 

diff --git a/.../crowdfunding_campaign/src/campaign.cairo → ...lications/crowdfunding/src/campaign.cairo b/.../crowdfunding_campaign/src/campaign.cairo → ...lications/crowdfunding/src/campaign.cairo
diff --git a/...campaign/src/campaign/contributions.cairo → ...dfunding/src/campaign/contributions.cairo b/...campaign/src/campaign/contributions.cairo → ...dfunding/src/campaign/contributions.cairo
diff --git a/...tions/crowdfunding_campaign/src/lib.cairo → ...s/applications/crowdfunding/src/lib.cairo b/...tions/crowdfunding_campaign/src/lib.cairo → ...s/applications/crowdfunding/src/lib.cairo
diff --git a/...owdfunding_factory/src/mock_upgrade.cairo → ...tions/crowdfunding/src/mock_upgrade.cairo b/...owdfunding_factory/src/mock_upgrade.cairo → ...tions/crowdfunding/src/mock_upgrade.cairo
diff --git a/...ons/crowdfunding_campaign/src/tests.cairo → ...applications/crowdfunding/src/tests.cairo b/...ons/crowdfunding_campaign/src/tests.cairo → ...applications/crowdfunding/src/tests.cairo
@@ -9,8 +9,8 @@ use snforge_std::{
     stop_cheat_caller_address, spy_events, SpyOn, EventSpy, EventAssertions, get_class_hash
 };
 
-use crowdfunding_campaign::campaign::{Campaign, ICampaignDispatcher, ICampaignDispatcherTrait};
-use crowdfunding_campaign::campaign::Status;
+use crowdfunding::campaign::{Campaign, ICampaignDispatcher, ICampaignDispatcherTrait};
+use crowdfunding::campaign::Status;
 use components::ownable::{IOwnableDispatcher, IOwnableDispatcherTrait};
 
 /// Deploy a campaign contract with the provided data

diff --git a/src/applications/advanced_factory.md b/src/applications/advanced_factory.md
@@ -3,5 +3,5 @@
 This is the CampaignFactory contract that creates new Campaign contract instances.
 
 ```rust
-{{#include ../../../listings/applications/crowdfunding_factory/src/contract.cairo:contract}}
+{{#include ../../../listings/applications/advanced_factory/src/contract.cairo:contract}}
 ```
diff --git a/src/applications/crowdfunding.md b/src/applications/crowdfunding.md
@@ -3,5 +3,5 @@
 This is the Crowdfunding Campaign contract.
 
 ```rust
-{{#include ../../../listings/applications/crowdfunding_campaign/src/contract.cairo:contract}}
+{{#include ../../../listings/applications/crowdfunding/src/contract.cairo:contract}}
 ```