Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Do not generate artifacts under target for contract check
  • Loading branch information
cmichi committed Dec 14, 2020
commit 54f2e9268c45cff27906d99f43134b3994d9556e
2 changes: 1 addition & 1 deletion src/cmd/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ fn execute(
build_artifact: BuildArtifacts,
unstable_flags: UnstableFlags,
) -> Result<BuildResult> {
let crate_metadata = CrateMetadata::collect(manifest_path)?;
let crate_metadata = CrateMetadata::collect(manifest_path, Some(build_artifact))?;
if build_artifact == BuildArtifacts::CodeOnly || build_artifact == BuildArtifacts::CheckOnly {
let (maybe_dest_wasm, maybe_optimization_result) = execute_with_crate_metadata(
&crate_metadata,
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/deploy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fn load_contract_code(path: Option<&PathBuf>) -> Result<Vec<u8>> {
let contract_wasm_path = match path {
Some(path) => path.clone(),
None => {
let metadata = crate_metadata::CrateMetadata::collect(&Default::default())?;
let metadata = crate_metadata::CrateMetadata::collect(&Default::default(), None)?;
metadata.dest_wasm
}
};
Expand Down
8 changes: 5 additions & 3 deletions src/cmd/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ pub(crate) fn execute(
build_artifact: BuildArtifacts,
unstable_options: UnstableFlags,
) -> Result<BuildResult> {
let crate_metadata = CrateMetadata::collect(manifest_path)?;
let crate_metadata = CrateMetadata::collect(manifest_path, Some(build_artifact))?;
let res = GenerateMetadataCommand {
crate_metadata,
verbosity,
Expand Down Expand Up @@ -354,6 +354,7 @@ mod tests {
fn generate_metadata() {
env_logger::try_init().ok();
with_tmp_dir(|path| {
let build_artifact = BuildArtifacts::All;
cmd::new::execute("new_project", Some(path)).expect("new project creation failed");
let working_dir = path.join("new_project");
let manifest_path = ManifestPath::new(working_dir.join("Cargo.toml"))?;
Expand All @@ -373,11 +374,12 @@ mod tests {
)?;
test_manifest.write()?;

let crate_metadata = CrateMetadata::collect(&test_manifest.manifest_path)?;
let crate_metadata =
CrateMetadata::collect(&test_manifest.manifest_path, Some(build_artifact))?;
let dest_bundle = cmd::metadata::execute(
&test_manifest.manifest_path,
None,
BuildArtifacts::All,
build_artifact,
UnstableFlags::default(),
)?
.dest_bundle
Expand Down
19 changes: 15 additions & 4 deletions src/crate_metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with cargo-contract. If not, see <http://www.gnu.org/licenses/>.

use crate::ManifestPath;
use crate::{BuildArtifacts, ManifestPath};
use anyhow::{Context, Result};
use cargo_metadata::{Metadata as CargoMetadata, MetadataCommand, Package};
use semver::Version;
Expand All @@ -41,11 +41,22 @@ pub struct CrateMetadata {

impl CrateMetadata {
/// Parses the contract manifest and returns relevant metadata.
pub fn collect(manifest_path: &ManifestPath) -> Result<Self> {
pub fn collect(
manifest_path: &ManifestPath,
build_artifact: Option<BuildArtifacts>,
) -> Result<Self> {
let (metadata, root_package) = get_cargo_metadata(manifest_path)?;

let mut target_directory = metadata.target_directory.clone();
target_directory.push("ink");
let target_directory = if let Some(_ba @ BuildArtifacts::CheckOnly) = build_artifact {
let tmp_dir = tempfile::Builder::new()
.prefix("cargo-contract_")
.tempdir()?;
tmp_dir.into_path()
} else {
let mut target_directory = metadata.target_directory.clone();
target_directory.push("ink");
target_directory
};

// Normalize the package name.
let package_name = root_package.name.replace("-", "_");
Expand Down