difftreelog
Fix warnings, update Dockerfile
in: master
4 files changed
Dockerfilediffbeforeafterboth--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@
FROM phusion/baseimage:18.04-1.0.0 as builder
LABEL maintainer="UniqueNetwork.io"
-ENV WASM_TOOLCHAIN=nightly-2021-01-27
-ENV NATIVE_TOOLCHAIN=1.49.0
+ENV WASM_TOOLCHAIN=nightly-2021-03-01
+# ENV NATIVE_TOOLCHAIN=1.50.0
ARG PROFILE=release
@@ -25,10 +25,10 @@
RUN export PATH="/cargo-home/bin:$PATH" && \
export CARGO_HOME="/cargo-home" && \
rustup toolchain uninstall $(rustup toolchain list) && \
- rustup toolchain install $NATIVE_TOOLCHAIN && \
+ # rustup toolchain install $NATIVE_TOOLCHAIN && \
rustup toolchain install $WASM_TOOLCHAIN && \
rustup target add wasm32-unknown-unknown --toolchain $WASM_TOOLCHAIN && \
- rustup default $NATIVE_TOOLCHAIN && \
+ rustup default $WASM_TOOLCHAIN && \
rustup target list --installed && \
rustup show
README.mddiffbeforeafterboth--- a/README.md
+++ b/README.md
@@ -63,18 +63,17 @@
2. Remove all installed toolchains with `rustup toolchain list` and `rustup toolchain uninstall <toolchain>`.
-3. Install stable toolchain 1.49.0 and make it default, install nightly 2021-01-27:
+3. Install install nightly 2021-03-01 and make it default:
```bash
-rustup toolchain install 1.49.0
-rustup toolchain install nightly-2020-01-27
-rustup default nightly-2021-01-27
+rustup toolchain install nightly-2021-03-01
+rustup default nightly-2021-03-01
```
4. Add wasm target for nightly toolchain:
```bash
-rustup target add wasm32-unknown-unknown --toolchain nightly-2021-01-27
+rustup target add wasm32-unknown-unknown --toolchain nightly-2021-03-01
```
5. Build:
node/src/service.rsdiffbeforeafterboth16use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};16use sp_consensus_aura::sr25519::{AuthorityPair as AuraPair};17use sc_finality_grandpa::SharedVoterState;17use sc_finality_grandpa::SharedVoterState;18use sc_keystore::LocalKeystore;18use sc_keystore::LocalKeystore;19use sc_telemetry::TelemetrySpan;201921// Our native executor instance.20// Our native executor instance.22native_executor_instance!(21native_executor_instance!(pallets/nft/src/lib.rsdiffbeforeafterboth--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -43,7 +43,6 @@
};
use sp_runtime::traits::StaticLookup;
use pallet_contracts::chain_extension::UncheckedFrom;
-use pallet_contracts::*;
use pallet_transaction_payment::OnChargeTransaction;
#[cfg(test)]
@@ -1118,13 +1117,11 @@
// Transfer permissions check
let target_collection = <Collection<T>>::get(collection_id);
- let allowance_limit = if (
- target_collection.limits.owner_can_transfer &&
+ let allowance_limit = if target_collection.limits.owner_can_transfer &&
Self::is_owner_or_admin_permissions(
collection_id,
sender.clone(),
- )
- ) {
+ ) {
None
} else if let Some(amount) = Self::owned_amount(
sender.clone(),