Fixing warning in command SubtractAssetQuantity, removing unnecessari…

…ly includes, small documentation change (#4251) * Fixed warning in subtractAssetQuantity - description was not being copied * Removed unnecessarily includes * Added mention about how to merge new commits * Trying to add some command to Dockerfile to fix Golang dependencies Signed-off-by: Grzegorz Bazior (Yodiss PSA) <[email protected]> * Update Dockerfile Signed-off-by: Sam H. Smith <[email protected]> * Update Dockerfile Signed-off-by: Sam H. Smith <[email protected]> --------- Signed-off-by: Grzegorz Bazior (Yodiss PSA) <[email protected]> Signed-off-by: Sam H. Smith <[email protected]> Co-authored-by: Grzegorz Bazior (Yodiss PSA) <[email protected]> Co-authored-by: Sam H. Smith <[email protected]>
hyperledger-iroha · Feb 8, 2024 · 88de1c6 · 88de1c6
1 parent affab26
commit 88de1c6
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 10 deletions.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -167,6 +167,7 @@ Git Style Guide
 -  First line of commit message must contain summary of work done,
    second line must contain empty line, third and other lines can
    contain list of commit changes
+-  When merging to destination branche: use **Squash and merge**
 
 C++ Style Guide
 ~~~~~~~~~~~~~~~

diff --git a/docker/develop/Dockerfile b/docker/develop/Dockerfile
@@ -44,8 +44,10 @@ RUN curl https://dl.google.com/go/go1.17.2.linux-$(dpkg --print-architecture).ta
 ENV GOPATH=/opt/gopath
 RUN mkdir ${GOPATH}
 ENV PATH=${PATH}:/opt/go/bin:${GOPATH}/bin
+RUN go install github.com/golang/protobuf/protoc-gen-go@latest
 RUN go get github.com/golang/protobuf/protoc-gen-go
 RUN export PATH="$PATH:$(go env GOPATH)/bin" # according to: https://grpc.io/docs/languages/go/quickstart/
+# RUN go mod init $(go env GOPATH) # according to: https://golangdocs.com/create-go-modules
 
 ## pip3 contains fresher versions of packages than apt
 RUN pip3 install --no-cache-dir cmake ninja

diff --git a/docker/iroha-builder/Dockerfile b/docker/iroha-builder/Dockerfile
@@ -44,6 +44,7 @@ RUN curl -fL https://golang.org/dl/go1.17.2.linux-$(dpkg --print-architecture).t
 ENV GOPATH=/opt/gopath
 RUN mkdir ${GOPATH}
 ENV PATH=${PATH}:/opt/go/bin:${GOPATH}/bin
+RUN go install github.com/golang/protobuf/protoc-gen-go@latest
 RUN go get github.com/golang/protobuf/protoc-gen-go
 RUN export PATH="$PATH:$(go env GOPATH)/bin" # according to: https://grpc.io/docs/languages/go/quickstart/
 

diff --git a/irohad/model/commands/subtract_asset_quantity.hpp b/irohad/model/commands/subtract_asset_quantity.hpp
@@ -37,7 +37,7 @@ namespace iroha {
 
       SubtractAssetQuantity(const std::string &asset_id,
                             const std::string &amount,
-                            const std::string &title)
+                            const std::string &description)
           : asset_id(asset_id), amount(amount), description(description) {}
     };
   }  // namespace model

diff --git a/shared_model/backend/protobuf/impl/proto_block_factory.cpp b/shared_model/backend/protobuf/impl/proto_block_factory.cpp
@@ -5,8 +5,6 @@
 
 #include "backend/protobuf/proto_block_factory.hpp"
 
-#include <sstream>
-
 #include <boost/assert.hpp>
 #include "backend/protobuf/block.hpp"
 

diff --git a/test/framework/integration_framework/fake_peer/behaviour/honest.cpp b/test/framework/integration_framework/fake_peer/behaviour/honest.cpp
@@ -7,16 +7,9 @@
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/range/adaptor/transformed.hpp>
-#include "backend/protobuf/proto_proposal_factory.hpp"
-#include "backend/protobuf/transaction.hpp"
 #include "common/bind.hpp"
-#include "common/result.hpp"
 #include "framework/integration_framework/fake_peer/block_storage.hpp"
-#include "framework/integration_framework/fake_peer/proposal_storage.hpp"
-#include "interfaces/iroha_internal/transaction_batch.hpp"
 #include "logger/logger.hpp"
-#include "module/shared_model/builders/protobuf/proposal.hpp"
-#include "validators/default_validator.hpp"
 
 using namespace iroha::expected;