difftreelog
Merge branch 'develop' into feature/rft_arbitrary_fractions
in: master
3 files changed
Dockerfilediffbeforeafterboth1# ===== BUILD ======23FROM phusion/baseimage:0.10.2 as builder4LABEL maintainer="gz@usetech.com"56ENV WASM_TOOLCHAIN=nightly-2020-10-0178ARG PROFILE=release910RUN apt-get update && \11 apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \12 apt-get install -y cmake pkg-config libssl-dev git clang1314# Get project and run it15#RUN git clone https://github.com/usetech-llc/nft_parachain /nft_parachain16RUN mkdir nft_parachain17WORKDIR /nft_parachain18COPY . .1920RUN export CARGO_HOME="/cargo-home" && curl https://sh.rustup.rs -sSf | sh -s -- -y21RUN export PATH="/cargo-home/bin:$PATH" && \22 export CARGO_HOME="/cargo-home" && \23 cargo fetch24RUN export PATH="/cargo-home/bin:$PATH" && \25 export CARGO_HOME="/cargo-home" && \26 rustup toolchain uninstall $(rustup toolchain list) && \27 rustup toolchain install $WASM_TOOLCHAIN && \28 rustup target add wasm32-unknown-unknown --toolchain $WASM_TOOLCHAIN && \29 rustup target list --installed && \30 rustup show3132RUN export PATH="/cargo-home/bin:$PATH" && \33 export CARGO_HOME="/cargo-home" && \34 cargo +$WASM_TOOLCHAIN build "--$PROFILE"35 # && \36 # cargo test3738# ===== RUN ======3940FROM phusion/baseimage:0.10.241ARG PROFILE=release4243COPY --from=builder /nft_parachain/target/$PROFILE/nft /usr/local/bin4445EXPOSE 994446VOLUME ["/chain-data"]4748# Copy and run start script49COPY ["./run.sh", "./run.sh"]50RUN chmod +x ./run.sh51CMD ["bash", "-c", "./run.sh"]1# ===== BUILD ======23FROM phusion/baseimage:18.04-1.0.0 as builder4LABEL maintainer="gz@usetech.com"56ENV WASM_TOOLCHAIN=nightly-2021-01-2778ARG PROFILE=release910RUN apt-get update && \11 apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \12 apt-get install -y cmake pkg-config libssl-dev git clang1314# Get project and run it15#RUN git clone https://github.com/usetech-llc/nft_parachain /nft_parachain16RUN mkdir nft_parachain17WORKDIR /nft_parachain18COPY . .1920RUN export CARGO_HOME="/cargo-home" && curl https://sh.rustup.rs -sSf | sh -s -- -y21RUN export PATH="/cargo-home/bin:$PATH" && \22 export CARGO_HOME="/cargo-home" && \23 cargo fetch24RUN export PATH="/cargo-home/bin:$PATH" && \25 export CARGO_HOME="/cargo-home" && \26 rustup toolchain uninstall $(rustup toolchain list) && \27 rustup toolchain install $WASM_TOOLCHAIN && \28 rustup target add wasm32-unknown-unknown --toolchain $WASM_TOOLCHAIN && \29 rustup target list --installed && \30 rustup show3132RUN export PATH="/cargo-home/bin:$PATH" && \33 export CARGO_HOME="/cargo-home" && \34 cargo +$WASM_TOOLCHAIN build "--$PROFILE"35 # && \36 # cargo test3738# ===== RUN ======3940FROM phusion/baseimage:18.04-1.0.041ARG PROFILE=release4243COPY --from=builder /nft_parachain/target/$PROFILE/nft /usr/local/bin4445EXPOSE 994446VOLUME ["/chain-data"]4748# Copy and run start script49COPY ["./run.sh", "./run.sh"]50RUN chmod +x ./run.sh51CMD ["bash", "-c", "./run.sh"]tests/src/addCollectionAdmin.test.tsdiffbeforeafterboth--- a/tests/src/addCollectionAdmin.test.ts
+++ b/tests/src/addCollectionAdmin.test.ts
@@ -103,7 +103,7 @@
});
});
- it('Add an admin to a collection that has reached the maximum number of admins limit', async () => {
+ it.only('Add an admin to a collection that has reached the maximum number of admins limit', async () => {
await usingApi(async (api: ApiPromise) => {
const Alice = privateKey('//Alice');
const accounts = [
@@ -118,17 +118,17 @@
const collectionId = await createCollectionExpectSuccess();
const chainLimit = await api.query.nft.chainLimit() as unknown as { CollectionAdminsLimit: BN };
- const chainLimitNumber = chainLimit.CollectionAdminsLimit.toNumber();
- expect(chainLimitNumber).to.be.equal(5);
+ const chainAdminLimit = chainLimit.CollectionAdminsLimit.toNumber();
+ expect(chainAdminLimit).to.be.equal(5);
- for (let i = 0; i < chainLimitNumber; i++) {
+ for (let i = 0; i < chainAdminLimit; i++) {
const changeAdminTx = api.tx.nft.addCollectionAdmin(collectionId, accounts[i]);
await submitTransactionAsync(Alice, changeAdminTx);
const adminListAfterAddAdmin: any = (await api.query.nft.adminList(collectionId));
expect(adminListAfterAddAdmin).to.be.contains(accounts[i]);
}
- const tx = api.tx.nft.addCollectionAdmin(collectionId, accounts[chainLimitNumber]);
+ const tx = api.tx.nft.addCollectionAdmin(collectionId, accounts[chainAdminLimit]);
await expect(submitTransactionExpectFailAsync(Alice, tx)).to.be.rejected;
});
});
tests/src/transfer.test.tsdiffbeforeafterboth--- a/tests/src/transfer.test.ts
+++ b/tests/src/transfer.test.ts
@@ -63,7 +63,7 @@
});
});
- it('Create collection, balance transfers and check balance', async () => {
+ it('User can transfer owned token', async () => {
await usingApi(async (api) => {
const Alice = privateKey('//Alice');
const Bob = privateKey('//Bob');