diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 0659a339def..aa9957eee02 100644 --- 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 index 4f69de620db..88d53d062f5 100644 --- 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 index 1ec6acd4929..72388c0091e 100644 --- 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 index 8cebc24e204..3b52e25526b 100644 --- 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 index 93b8fef9ca1..2d57b2a19fb 100644 --- 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 - #include #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 index e009fb1496b..92b3fd90118 100644 --- 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 #include -#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;