Skip to content

Commit

Permalink
Add tools/make_sumeragi (#77)
Browse files Browse the repository at this point in the history
* Update consensus transaction (#61)

* Update consensus transaction

* Add config

* Feature/fix sumeragi (#66)

* Update consensus transaction

* Add config

* Update consensus transaction (#61) (#62)

* Update consensus transaction

* Add config

* Fix git submodule (#63)

* Hotfix/gitsubmodule (#64)

* Fix git submodule

* Use release

* major Update
- update some object
- update some command
- update transaction
- update consensus event

* Fix some models
dump function

* Update json parse

* Update consensus_event

* Update event_repository

* WIP Update sumeragi

* WIP Update repository

* Update some code

* Update test

* WIP sumeragi

* Update sumeragi

* Update json parser

* Update test

* Update event repository

* Little Update sumeragi

* Fix merge gomi

* Update merge develop

* Refactoring

* Feature/fix sumeragi (#69)

* Update consensus transaction

* Add config

* major Update
- update some object
- update some command
- update transaction
- update consensus event

* Fix some models
dump function

* Update json parse

* Update consensus_event

* Update event_repository

* WIP Update sumeragi

* WIP Update repository

* Update some code

* Update test

* WIP sumeragi

* Update sumeragi

* Update json parser

* Update test

* Update event repository

* Little Update sumeragi

* Fix merge gomi

* Removed useless std::move calls and fixed warnings

* Removed useless std::move calls and fixed warnings

Author:    Davide Benato <davide.benato@gmail.com>

* Removed useless std::move calls and fixed warnings

* Feature/iroha main (#73)

Replace Aeron

* Replace protobuf build -> download binary in circle.yml

* Feature/add utils (#76)

* update readme

* Develop (#74)

- Replace Aeron 
- Add Iroha-main

* add utils make_sumeragi.json

* Rename utils -> tools

* Fix some behavior

* Remove cmake replace

* Degrade cmake version 3.0 -> 2.8

* Fix cmake comments

* Check protoc

* Add update command

* Update sumeragi

* Update Cappuccino interface

* Add repository

* Update test

* Update gitmodules ignore = dirty

* Replace old cmake

* Update protoc

* Update position script in circle.yml

* Update circle.yml

* Update transaction

* Use cache

* Update smart contract, Add update

* Add smart contract test

* Add hash to target_link_libraries

* update .gitignore

* Fix comments in CMakeLists.txt

* Trust git recursive

* Remove unused test

* Update circle.yml

* Fix syntax in circle.yml

* Fix error in circle.yml

* Add cache to circle-ci

* Add cmake-build-debug to gitignore

* Fix missed merge

* Tests for sha3 hashing for a text in Russian added.
  • Loading branch information
MizukiSonoko committed Dec 16, 2016
1 parent dfe3e0a commit 5d801c7
Show file tree
Hide file tree
Showing 295 changed files with 18,077 additions and 377 deletions.
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
[submodule "core/vendor/Cappuccino"]
path = core/vendor/Cappuccino
url = https://github.com/MizukiSonoko/Cappuccino.git
ignore = dirty
[submodule "core/vendor/Cappuccino/lib/json"]
path = core/vendor/Cappuccino/lib/json
url = https://github.com/nlohmann/json.git
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 2.8)
PROJECT(iroha CXX)

ENABLE_LANGUAGE(C)
Expand All @@ -12,6 +12,8 @@ SET(CMAKE_SHARED_LINKER_FLAGS "-lpthread -lssl")
add_subdirectory(core)
add_subdirectory(peer)

add_subdirectory(tools)

if(NOT without-test)
enable_testing()
include(test/gtest.cmake)
Expand Down
44 changes: 18 additions & 26 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,40 +17,32 @@ machine:
- sudo apt-get -y install xsltproc
- sudo apt-get -y install libhdf5-serial-dev libleveldb-dev libsnappy-dev liblmdb-dev
- sudo apt-get -y install autoconf automake libtool unzip
- cd /tmp
- sudo apt-get -y purge cmake
- curl -sSL https://cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.tar.gz | sudo tar -xzC /opt

dependencies:
cache_directories:
- ~/iroha/core/vendor/
pre:
- cd /tmp; git clone -b v3.0.0 https://github.com/google/protobuf.git
- cd /tmp/protobuf;(git cherry-pick 1760feb621a913189b90fe8595fffb74bce84598; echo Force continue)
- cd /tmp/protobuf; ./autogen.sh; ./configure --prefix=/usr; make -j 16; sudo make install
- protoc --version
- cd /tmp; git clone -b $(curl -L http://grpc.io/release) https://github.com/grpc/grpc
- cd /tmp/grpc; git submodule update --init; make; sudo make install
- which grpc_cpp_plugin
override:
- mkdir build; cd build; cmake ..; make
checkout:
post:
- cd $IROHA_HOME
- rm -rf core/vendor/KeccakCodePackage
- rm -rf core/vendor/leveldb
- rm -rf core/vendor/ed25519
- rm -rf core/vendor/json
- rm -rf core/vendor/Cappuccino
- git clone https://github.com/gvanas/KeccakCodePackage.git core/vendor/KeccakCodePackage
- git clone https://github.com/google/leveldb.git core/vendor/leveldb
- git clone https://github.com/MizukiSonoko/ed25519.git core/vendor/ed25519
- git clone https://github.com/nlohmann/json.git core/vendor/json
- git clone --recursive https://github.com/MizukiSonoko/Cappuccino.git core/vendor/Cappuccino
- cd $IROHA_HOME/core/vendor/leveldb; make -j 14
- cd $IROHA_HOME/core/vendor/ed25519; make -j 14
- cd $IROHA_HOME/core/vendor/Cappuccino; git pull
- cd $IROHA_HOME/core/vendor/KeccakCodePackage; make; make generic64/libkeccak.a
- cd $IROHA_HOME/core/infra/crypto/; make

dependencies:
cache_directories:
- ~/iroha/core/vendor/
- /tmp/protobuf
- /tmp/grpc
pre:
- if [[ ! -e /tmp/protobuf ]]; then git clone -b v3.0.0 https://github.com/google/protobuf.git /tmp/protobuf; cd /tmp/protobuf; (git cherry-pick 1760feb621a913189b90fe8595fffb74bce84598; echo Force continue); cd /tmp/protobuf; ./autogen.sh; ./configure --prefix=/usr; make -j 16; fi;
- cd /tmp/protobuf; sudo make install
- protoc --version

- if [[ ! -e /tmp/grpc ]]; then git clone -b $(curl -L http://grpc.io/release) https://github.com/grpc/grpc /tmp/grpc; cd /tmp/grpc; git submodule update --init; make -j 14; fi;
- cd /tmp/grpc; sudo make install
- which grpc_cpp_plugin

test:
pre:
- mkdir build; cd build; cmake ..; make
override:
- ./test.sh

0 comments on commit 5d801c7

Please sign in to comment.