Import release v0.9.2

This is a legacy import of the release originally managed in pure
github.  You may find the history of this release in the archives
here:

https://github.com/hyperledger-archives/fabric-chaintool/releases/tag/v0.9.2

Change-Id: Ie550b43bed85c66a5b90733bd686000645ea4914
Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>

Author: ghaskins

examples/invoker/src/chaincode/chaincode.go

@@ -17,7 +17,7 @@ specific language governing permissions and limitations
 under the License.
 */
 
-package chaincode
+package main
 
 import (
 	"fmt"
@@ -90,7 +90,7 @@ func (t *ChaincodeExample) CheckBalance(stub shim.ChaincodeStubInterface, param
 
 func main() {
 	self := &ChaincodeExample{}
-	interfaces := ccs.Interfaces {
+	interfaces := ccs.Interfaces{
 		"org.hyperledger.chaincode.example02": self,
 		"appinit": self,
 	}

project.clj

@@ -1,6 +1,6 @@
-(defproject chaintool "0.9.1"
-  :description "hyperledger chaincode tool"
-  :url "https://github.com/ghaskins/chaintool"
+(defproject chaintool "0.9.2"
+  :description "Hyperledger Fabric chaincode tool"
+  :url "https://github.com/hyperledger/fabric-chaintool"
   :license {:name "Apache License"
             :url "http://www.apache.org/licenses/LICENSE-2.0.txt"}
   :min-lein-version "2.0.0"

resources/generators/golang.stg

@@ -424,19 +424,26 @@ implementclient(txn, intf, func) ::=
 func <func.name>(stub shim.ChaincodeStubInterface, chaincodeName string<if(func.param)>, params *<func.param><endif>) <\\>
 <if(func.rettype)>(*<func.rettype>, error)<else>error<endif> {
 
-     args := make([]string, 1)
+     <if(func.param)>
+     args := make([][]byte, 2)
+     <else>
+     args := make([][]byte, 1)
+     <endif>
      var err error
 
+     args[0] = []byte(<compositename(txn, intf, func)>)
+
      <if(func.param)>
      _pboutput, err := proto.Marshal(params)
      if (err != nil) {
           return <if(func.rettype)>nil, <endif>err
      }
 
-     args[0] = base64.StdEncoding.EncodeToString(_pboutput)
+     args[1] = make([]byte, base64.StdEncoding.EncodedLen(len(_pboutput)))
+     base64.StdEncoding.Encode(args[1], _pboutput)
      <endif>
 
-     <if(func.rettype)>_result, err :=<else>_, err =<endif> stub.<if(txn)>Invoke<else>Query<endif>Chaincode(chaincodeName, <compositename(txn, intf, func)>, args)
+     <if(func.rettype)>_result, err :=<else>_, err =<endif> stub.<if(txn)>Invoke<else>Query<endif>Chaincode(chaincodeName, args)
 
      <if(func.rettype)>
      result := &<func.rettype>{}

src/chaintool/build/core.clj

@@ -16,7 +16,15 @@
             [chaintool.platforms.api :as platforms.api])
   (:refer-clojure :exclude [compile]))
 
-(defn compile [{:keys [config] :as params}]
+
+(defn- run [fcn {:keys [config] :as params}]
   (when-let [platform (platforms.core/find config)]
-    ;; generate platform output (shim, protobufs, etc)
-    (platforms.api/build platform params)))
+    (fcn platform params)))
+
+;; generate platform output (shim, protobufs, etc)
+(defn compile [params]
+  (run platforms.api/build params))
+
+;; display environment variables used for build
+(defn env [params]
+  (run platforms.api/env params))

src/chaintool/core.clj

@@ -21,6 +21,7 @@
             [chaintool.subcommands.package :as packagecmd]
             [chaintool.subcommands.proto :as protocmd]
             [chaintool.subcommands.unpack :as unpackcmd]
+            [chaintool.subcommands.env :as envcmd]
             [chaintool.util :as util]
             [clojure.string :as string]
             [clojure.tools.cli :refer [parse-opts]]
@@ -78,6 +79,10 @@
     :validate (fn [options arguments] (= (count arguments) 1))
     :options common-options}
 
+   {:name "env" :desc "Display variables used in the build environment"
+    :handler envcmd/run
+    :options common-path-options}
+
    {:name "proto" :desc "Compiles a CCI file to a .proto"
     :handler protocmd/run
     :arguments "path/to/file.cci"

src/chaintool/platforms/api.clj

@@ -15,6 +15,8 @@
 (ns chaintool.platforms.api)
 
 (defprotocol Platform
+  ;; Displays environment variables relevant to the build environment
+  (env [this params])
   ;; Compiles the platform
   (build [this params])
   ;; Cleans any previous builds of the platform

src/chaintool/platforms/golang/system.clj

@@ -41,6 +41,11 @@
 (deftype GolangSystemPlatform []
   platforms.api/Platform
 
+  ;;-----------------------------------------------------------------
+  ;; env - Emits the GOPATH used for building system chaincode
+  ;;-----------------------------------------------------------------
+  (env [_ _])
+
   ;;-----------------------------------------------------------------
   ;; build - generates all golang platform artifacts within the
   ;; default location in the build area

src/chaintool/platforms/golang/userspace.clj

@@ -30,6 +30,12 @@
 (deftype GolangUserspacePlatform []
   platforms.api/Platform
 
+  ;;-----------------------------------------------------------------
+  ;; env - Emits the GOPATH used for building golang chaincode
+  ;;-----------------------------------------------------------------
+  (env [_ {:keys [path]}]
+    (println (str "GOPATH=" (buildgopath path))))
+
   ;;-----------------------------------------------------------------
   ;; build - generates all golang platform artifacts within the
   ;; default location in the build area

src/chaintool/subcommands/env.clj

@@ -0,0 +1,19 @@
+;; Licensed under the Apache License, Version 2.0 (the "License");
+;; you may not use this file except in compliance with the License.
+;; You may obtain a copy of the License at
+;;
+;;                  http://www.apache.org/licenses/LICENSE-2.0
+;;
+;; Unless required by applicable law or agreed to in writing, software
+;; distributed under the License is distributed on an "AS IS" BASIS,
+;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+;; See the License for the specific language governing permissions and
+;; limitations under the License.
+
+(ns chaintool.subcommands.env
+  (:require [chaintool.config.util :as config.util]
+            [chaintool.build.core :as build.core]))
+
+(defn run [options args]
+  (let [[path config] (config.util/load-from-options options)]
+    (build.core/env {:path path :config config})))