Split deploy section into sewup.toml (#200)

Split deploy section into `sewup.toml`

README.md

@@ -60,6 +60,15 @@ opt-level = "z"
 incremental = false
 opt-level = "z"
 
+# Following features helps are used when building or testing a contract
+[features]
+constructor = []  # required
+constructor-test = [] # required
+```
+
+```toml
+# sewup.toml
+
 # Following section including the parameters to deploy the contract
 [deploy]
 url = "http://localhost:8545"  # url for rpc node
@@ -68,11 +77,6 @@ address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"  # account address
 # gas = 5000000 # optional
 # gas_price = 1 # optional
 
-
-# Following features helps are used when building or testing a contract
-[features]
-constructor = []  # required
-constructor-test = [] # required
 ```
 Place [.cargo/config](./examples/hello-contract/.cargo/config) file in your project to specify the flags for build.
 

cargo-sewup/src/build.rs

@@ -10,14 +10,14 @@ use tokio::{
 use wasmprinter::print_file;
 use wat;
 
-use cargo_sewup::config::Toml;
+use cargo_sewup::config::CargoToml;
 use cargo_sewup::deploy_wasm;
 
 async fn check_cargo_toml() -> Result<String> {
     let config_contents = read_to_string("Cargo.toml")
         .await
         .context("can not read Cargo.toml")?;
-    let config: Toml = toml::from_str(config_contents.as_str())?;
+    let config: CargoToml = toml::from_str(config_contents.as_str())?;
 
     // TODO: more toml config checking here
 

cargo-sewup/src/config.rs

@@ -5,7 +5,6 @@ use serde_derive::Deserialize;
 use tokio::fs::read_to_string;
 
 use crate::constants::{DEFAULT_GAS, DEFAULT_GAS_PRICE};
-use crate::errors::DeployError;
 
 #[derive(Deserialize)]
 pub struct Deploy {
@@ -37,20 +36,20 @@ pub struct Package {
 }
 
 #[derive(Deserialize)]
-pub struct Toml {
+pub struct CargoToml {
     pub package: Package,
-    pub deploy: Option<Deploy>,
+}
+
+#[derive(Deserialize)]
+pub struct DeployToml {
+    pub deploy: Deploy,
 }
 
 pub async fn get_deploy_config() -> Result<Deploy> {
-    let config_contents = read_to_string("Cargo.toml")
+    let config_contents = read_to_string("sewup.toml")
         .await
-        .context("can not read Cargo.toml")?;
-    let config: Toml = toml::from_str(config_contents.as_str())?;
+        .context("can not read sewup.toml")?;
+    let config: DeployToml = toml::from_str(config_contents.as_str())?;
 
-    if let Some(deploy) = config.deploy {
-        Ok(deploy)
-    } else {
-        Err(DeployError::ConfigIncorrect.into())
-    }
+    Ok(config.deploy)
 }

examples/default-contract/Cargo.toml

@@ -27,13 +27,6 @@ opt-level = "z"
 incremental = false
 opt-level = "z"
 
-[deploy]
-url = "http://localhost:8545"
-private = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-gas = 5000000
-gas_price = 1
-
 [features]
 constructor = []
 constructor-test = []

examples/default-contract/sewup.toml

@@ -0,0 +1,7 @@
+# This config file is for examples, it is good for you to ignore this config in your sewup project
+[deploy]
+url = "http://localhost:8545"
+private = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+gas = 5000000
+gas_price = 1

examples/erc1155-contract/Cargo.toml

@@ -27,11 +27,6 @@ opt-level = "z"
 incremental = false
 opt-level = "z"
 
-[deploy]
-url = "http://localhost:8545"
-private = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-
 [features]
 constructor = []
 constructor-test = []

examples/erc1155-contract/sewup.toml

@@ -0,0 +1,5 @@
+# This config file is for examples, it is good for you to ignore this config in your sewup project
+[deploy]
+url = "http://localhost:8545"
+private = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"

examples/erc20-contract/Cargo.toml

@@ -27,11 +27,6 @@ opt-level = "z"
 incremental = false
 opt-level = "z"
 
-[deploy]
-url = "http://localhost:8545"
-private = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-
 [features]
 constructor = []
 constructor-test = []

examples/erc20-contract/sewup.toml

@@ -0,0 +1,5 @@
+# This config file is for examples, it is good for you to ignore this config in your sewup project
+[deploy]
+url = "http://localhost:8545"
+private = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"

examples/erc721-contract/Cargo.toml

@@ -27,11 +27,6 @@ opt-level = "z"
 incremental = false
 opt-level = "z"
 
-[deploy]
-url = "http://localhost:8545"
-private = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-
 [features]
 constructor = []
 constructor-test = []

examples/erc721-contract/sewup.toml

@@ -0,0 +1,5 @@
+# This config file is for examples, it is good for you to ignore this config in your sewup project
+[deploy]
+url = "http://localhost:8545"
+private = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"

examples/hello-contract/Cargo.toml

@@ -37,11 +37,6 @@ opt-level = "z"
 incremental = false
 opt-level = "z"
 
-[deploy]
-url = "http://localhost:8545"
-private = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-
 [features]
 constructor = []
 constructor-test = []

examples/hello-contract/sewup.toml

@@ -0,0 +1,5 @@
+# This config file is for examples, it is good for you to ignore this config in your sewup project
+[deploy]
+url = "http://localhost:8545"
+private = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"

examples/kv-contract/Cargo.toml

@@ -41,11 +41,6 @@ opt-level = "z"
 incremental = false
 opt-level = "z"
 
-[deploy]
-url = "http://localhost:8545"
-private = "0000000000000000000000000000000000000000000000000000000000000000"
-address = "0x0000000000000000000000000000000000000000"
-
 [features]
 client = [ "web3", "tokio", "secp256k1", "reqwest", "serde_json", "bincode", "cargo-sewup"]
 constructor = []

examples/kv-contract/sewup.toml

@@ -0,0 +1,5 @@
+# This config file is for examples, it is good for you to ignore this config in your sewup project
+[deploy]
+url = "http://localhost:8545"
+private = "0000000000000000000000000000000000000000000000000000000000000000"
+address = "0x0000000000000000000000000000000000000000"

examples/rdb-contract/Cargo.toml

@@ -43,11 +43,6 @@ opt-level = "z"
 incremental = false
 opt-level = "z"
 
-[deploy]
-url = "http://localhost:8545"
-private = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-
 [features]
 client = [ "web3", "tokio", "secp256k1", "reqwest", "serde_json", "bincode", "cargo-sewup"]
 constructor = []

examples/rdb-contract/sewup.toml

@@ -0,0 +1,5 @@
+# This config file is for examples, it is good for you to ignore this config in your sewup project
+[deploy]
+url = "http://localhost:8545"
+private = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"

examples/rusty-contract/Cargo.toml

@@ -25,11 +25,6 @@ opt-level = "z"
 incremental = false
 opt-level = "z"
 
-[deploy]
-url = "http://localhost:8545"
-private = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-
 [features]
 constructor = []
 constructor-test = []

examples/rusty-contract/sewup.toml

@@ -0,0 +1,5 @@
+# This config file is for examples, it is good for you to ignore this config in your sewup project
+[deploy]
+url = "http://localhost:8545"
+private = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+address = "0xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"