Skip to content

Commit

Permalink
Merge 1248a9e into 9f8cffe
Browse files Browse the repository at this point in the history
  • Loading branch information
Robbepop committed Jan 31, 2020
2 parents 9f8cffe + 1248a9e commit f9395e2
Show file tree
Hide file tree
Showing 194 changed files with 5,290 additions and 17,822 deletions.
2 changes: 0 additions & 2 deletions Cargo.toml
Expand Up @@ -3,9 +3,7 @@
members = [
"abi",
"core",
"lang",
"lang2",
"model",
"prelude",
"utils",
]
Expand Down
2 changes: 1 addition & 1 deletion LICENSE_TEMPLATE
@@ -1,4 +1,4 @@
// Copyright 2018-2019 Parity Technologies (UK) Ltd.
// Copyright {20\d{2}}-{20\d{2}} Parity Technologies (UK) Ltd.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down
11 changes: 10 additions & 1 deletion core/Cargo.toml
Expand Up @@ -23,9 +23,16 @@ ink_prelude = { path = "../prelude/", default-features = false }

scale = { package = "parity-scale-codec", version = "1.1", default-features = false, features = ["derive", "full"] }
type-metadata = { git = "https://github.com/type-metadata/type-metadata.git", default-features = false, features = ["derive"], optional = true }
derive_more = { version = "0.99.2", default-features = false, features = ["from"] }
derive_more = { version = "0.99.2", default-features = false, features = ["from", "display"] }
smallvec = { version = "1.0", default-features = false, features = ["union"] }
cfg-if = "0.1"
num-traits = { version = "0.2.1", default-features = false, feature = ["i128"] }

# Only used in the off-chain environment.
#
# Sadly couldn't be marked as dev-dependency.
# Never use this crate outside of the off-chain environment!
rand = { version = "0.7", default-features = false, features = ["alloc"] }

[features]
default = ["test-env"]
Expand All @@ -38,6 +45,8 @@ std = [
"ink_prelude/std",
"scale/std",
"type-metadata/std",
"rand/std",
"num-traits/std",
]
ink-generate-abi = [
"ink_abi",
Expand Down
138 changes: 0 additions & 138 deletions core/src/env/api.rs

This file was deleted.

0 comments on commit f9395e2

Please sign in to comment.