Merge pull request #12 from Cargill/agunde406-grid-sdk

Add the initial Grid SDK
hyperledger-archives · Mar 19, 2019 · 7131915 · 7131915
2 parents 5acab78 + 4085f41
commit 7131915
Show file tree

Hide file tree

Showing 16 changed files with 404 additions and 243 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,9 @@ contracts/track_and_trace/bin/
 contracts/track_and_trace/target/
 contracts/track_and_trace/src/messages/
 
+sdk/Cargo.lock
+sdk/target
+
 # Node
 **/node_modules
 **/package-lock.json

diff --git a/contracts/track_and_trace/Cargo.toml b/contracts/track_and_trace/Cargo.toml
@@ -25,10 +25,7 @@ rust-crypto = "0.2.36"
 rustc-serialize = "0.3.22"
 sawtooth-zmq = "0.8.2-dev5"
 clap = "2"
-protobuf = "2"
+grid-sdk = { path = "../../sdk" }
 log = "0.3.0"
 log4rs = "0.7.0"
-
-[build-dependencies]
-protoc-rust = "2"
-glob = "0.2"
+protobuf = "2"
diff --git a/contracts/track_and_trace/Dockerfile b/contracts/track_and_trace/Dockerfile
@@ -52,9 +52,14 @@ RUN apt-get update && apt-get install -y protobuf-compiler
 #   - /grid/contracts/track_and_trace/src/messages/
 WORKDIR /grid
 RUN USER=root cargo new --bin contracts/track_and_trace
+RUN USER=root cargo new --lib sdk --name grid-sdk
+
+# copy grid-sdk to build track and trace
+WORKDIR /grid/sdk
+COPY sdk ./
 
 WORKDIR /grid/contracts/track_and_trace
-COPY Cargo.toml Cargo.lock* ./
+COPY contracts/track_and_trace/Cargo.toml contracts/track_and_trace/Cargo.lock* ./
 RUN cargo build
 
 ENV PATH=$PATH:/grid/contracts/track_and_trace/target/debug/