Fix nouse btreeset (#87)

* Public chainspec for testnet v2
* Bump runtime version
* Switch current implementation to v0.6.1 in README
* fix docekr (#86)

* Fix substrate commit at plasm-v0.6.1

* fix docker make

* change btree to vec

* passed merge master

* only use latest nightly build

* fix not need nightly

* use stable plsm-cli

frame/operator/src/lib.rs

@@ -1,7 +1,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use contract::{BalanceOf, CodeHash, ContractAddressFor, Gas};
-use rstd::collections::btree_set::BTreeSet;
 use sp_runtime::traits::{MaybeDisplay, MaybeSerialize, Member};
 use support::{decl_event, decl_module, decl_storage, dispatch::Result, Parameter};
 use system::{ensure_signed, RawOrigin};
@@ -31,7 +30,7 @@ pub trait Trait: contract::Trait {
 decl_storage! {
     trait Store for Module<T: Trait> as Operator {
         /// A mapping from operators to operated contracts by them.
-        pub OperatorHasContracts: map T::AccountId => BTreeSet<T::AccountId>;
+        pub OperatorHasContracts: map T::AccountId => Vec<T::AccountId>;
         /// A mapping from operated contract by operator to it.
         pub ContractHasOperator: map T::AccountId => Option<T::AccountId>;
         /// A mapping from contract to it's parameters.
@@ -62,7 +61,7 @@ decl_module! {
             contract::Module::<T>::instantiate(RawOrigin::Signed(operator.clone()).into(), endowment, gas_limit, code_hash, data)?;
 
             // add operator to contracts
-            <OperatorHasContracts<T>>::mutate(&operator, {|tree| (*tree).insert(contract.clone()) });
+            <OperatorHasContracts<T>>::mutate(&operator, {|tree| (*tree).push(contract.clone()) });
             // add contract to operator
             <ContractHasOperator<T>>::insert(&contract, operator.clone());
             // add contract to parameters
@@ -106,11 +105,11 @@ decl_module! {
 
             // remove origin operator to contracts
             <OperatorHasContracts<T>>::mutate(&operator,
-                |tree| for c in contracts.iter() { (*tree).remove(c); }
-            );
+            	|tree| *tree = tree.iter().filter(|&x| !contracts.contains(x)).cloned().collect());
+
             // add new_operator to contracts
             <OperatorHasContracts<T>>::mutate(&new_operator,
-                |tree| for c in contracts.iter() { (*tree).insert(c.clone()); }
+                |tree| for c in contracts.iter() { (*tree).push(c.clone()); }
             );
             for c in contracts.iter() {
                 // add contract to new_operator

third-party/docker/Makefile

@@ -3,7 +3,7 @@ CHILD_NODE_DIR := $(shell git rev-parse --show-toplevel)/child
 
 .PHONY: docker-build
 docker-build:
-	docker run -it -v $(shell pwd)/../..:/opt stakedtechnologies/plasm-builder cargo build -p plasm-cli --target-dir third-party/docker/target-debian --release
+	docker run -it -v $(shell pwd)/../..:/opt stakedtechnologies/plasm-builder cargo build --target-dir third-party/docker/target-debian --release
 	docker build . -t stakedtechnologies/plasm-node
 
 .PHONY: docker-push