v0.3.0

.gitignore

@@ -1 +1,2 @@
 /target
+/build/*

Makefile

@@ -1,5 +1,5 @@
-accountId =
-contractId =
+accountId = 
+contractId = 
 # ------------------------------------------------------
 # 
 # set : Sets the account and contract id
@@ -28,6 +28,7 @@ contractId =
 #
 # ------------------------------------------------------
 MKPATH = $(abspath $(lastword $(MAKEFILE_LIST)))
+BUILDPATH = build
 
 C=cargo
 R=rustup
@@ -100,11 +101,12 @@ test:
 build: test
 	@$(R) target add $(CTARGET)
 	@$(CFLAG)='-C link-arg=-s' $(C) build --release --target=$(CTARGET)
-	@cp ./target/$(CTARGET)/release/*.wasm ./res/
+	@if [ ! -d "$(BUILDPATH)" ]; then mkdir $(BUILDPATH); fi
+	@cp ./target/$(CTARGET)/release/*.wasm ./$(BUILDPATH)/
 
 deploy: checkAccount test build
 	@echo "deploying ${contractId} with ${accountId} \ninitFunction = ${initFunction}\ninitArgs = ${initArgs}\ninitGas = ${initGas}\ninitDeposit = ${initDeposit}\n"
-	@$(N) deploy $(contractId) --wasmFile ./res/*.wasm \
+	@$(N) deploy $(contractId) --wasmFile ./$(BUILDPATH)/*.wasm \
 		$(if $(initFunction), --initFunction=$(initFunction)) \
 		$(if $(initArgs), --initArgs='$(initArgs)') \
 		$(if $(initGas), --initGas=$(initGas)) \
@@ -127,7 +129,7 @@ view: checkAccount checkMethod
 # ------------------------------------------------------
 
 clean:
-	@rm -rf ./res/*.wasm
+	@rm -rf ./$(BUILDPATH)/*
 	@$(C) clean
 
 

install.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+set -e # if any command fails, exit the script
+
 
 git clone https://github.com/just-do-halee/near-contract
 

src/cmn.rs

@@ -1,7 +1,13 @@
 pub use near_sdk::{
     borsh::{self, BorshDeserialize, BorshSerialize},
-    env, log, near_bindgen, require,
+    PanicOnDefault,
 };
+pub use near_sdk::{
+    collections::{self, LazyOption, LegacyTreeMap, TreeMap},
+    store::*,
+};
+pub use near_sdk::{env, log, near_bindgen, require};
+pub use near_sdk::{json_types::*, AccountId, Balance, Promise};
 
 /// Hex encoding/decoding: .encode_hex() and .decode_hex()
 pub use uint::hex::{FromHex, FromHexError, ToHex};
@@ -133,7 +139,7 @@ pub mod test_utils {
     }
     pub use vm;
 
-    /// Create a container for logs.
+    /// Create a container for logs mocks.
     ///
     /// # Example
     /// ```

src/lib.rs

@@ -2,18 +2,20 @@ mod cmn;
 use cmn::*;
 
 #[near_bindgen]
-#[derive(Default, BorshDeserialize, BorshSerialize)]
+#[derive(PanicOnDefault, BorshDeserialize, BorshSerialize)]
 pub struct Contract {
     // contract state
     solution: String,
 }
 
-#[near_bindgen]
 impl Contract {
     fn hash(s: String) -> String {
         hash(s, env::sha256).encode_hex::<String>()
     }
+}
 
+#[near_bindgen]
+impl Contract {
     // contract methods
     #[init]
     pub fn new(solution: String) -> Self {