diff --git a/Example/IrohaCommunication.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/IrohaCommunication.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/Example/IrohaCommunication.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Example/Podfile.lock b/Example/Podfile.lock index f17e4b2a4..856e25762 100755 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -42,7 +42,7 @@ DEPENDENCIES: - IrohaCommunication (from `../`) SPEC REPOS: - https://github.com/cocoapods/specs.git: + https://github.com/CocoaPods/Specs.git: - BoringSSL - gRPC - gRPC-Core @@ -69,4 +69,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 29089a97c3781ec366ef8266addf4289525ff849 -COCOAPODS: 1.7.5 +COCOAPODS: 1.8.0 diff --git a/IrohaCommunication.podspec b/IrohaCommunication.podspec index 9f23c3eaf..106fd5d3b 100755 --- a/IrohaCommunication.podspec +++ b/IrohaCommunication.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'IrohaCommunication' - s.version = '3.4.0' + s.version = '3.4.1' s.summary = 'Helper classes to use for communication with Iroha blockchain.' s.homepage = 'https://github.com/hyperledger/iroha-ios' diff --git a/IrohaCommunication/Classes/Public/Service/IRNetworkService.m b/IrohaCommunication/Classes/Public/Service/IRNetworkService.m index 7fa7d3563..6ce618d98 100755 --- a/IrohaCommunication/Classes/Public/Service/IRNetworkService.m +++ b/IrohaCommunication/Classes/Public/Service/IRNetworkService.m @@ -9,11 +9,11 @@ #import "IRTransactionImpl.h" #import "Transaction.pbobjc.h" #import "IRTransactionStatusResponseImpl+Proto.h" -#import "GRPCCall+Tests.h" #import "IRQueryResponse+Proto.h" #import "IRBlockQueryRequestImpl.h" #import "IRBlockQueryResponse+Proto.h" #import "GRPCProtoCall+Cancellable.h" +#import #import @interface IRNetworkService() diff --git a/README.md b/README.md index 9ca7e44f3..c3c08a725 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Hyperledger Iroha iOS library -### Please pay attention! Current version of the library was tested and compatible with [![Iroha 1.0.0](https://img.shields.io/badge/Iroha-1.0.1-green.svg)](https://github.com/hyperledger/iroha/releases/tag/1.0.1). +### Please pay attention! Current version of the library was tested and compatible with [![Iroha 1.1.1](https://img.shields.io/badge/Iroha-1.1.1-green.svg)](https://github.com/hyperledger/iroha/releases/tag/1.1.1). The library was created to provide convienent interface for iOS applications to communicate with [Iroha](https://github.com/hyperledger/iroha) blockchain including sending transactions/query, streaming transaction statuses and block commits. @@ -27,11 +27,17 @@ Feel free to experiment with example project and don't hesistate to ask any ques Integration tests is a good place to check existing scenarious or to introduce new ones. To run integration tests, please, go through steps below: 1. Follow instructions from [Iroha documentation](https://iroha.readthedocs.io/en/latest/getting_started/) to setup and run iroha peer in [Docker](https://www.docker.com) container. However make sure you run iroha using following command (consider additional --overwrite_ledger flag): -```docker run --name iroha -d -p 50051:50051 -v $(pwd)/iroha/example:/opt/iroha_data -v blockstore:/tmp/block_store --network=iroha-network -e KEY='node0 --overwrite_ledger' hyperledger/iroha:latest```. +``` +docker run --name iroha -d -p 50051:50051 -v $(pwd)/iroha/example:/opt/iroha_data -v blockstore:/tmp/block_store --network=iroha-network -e KEY='node0 --overwrite_ledger' hyperledger/iroha:latest +``` 2. Launch proxy for docker daemon to make it available through http. For example, one can use socat utility: -```brew install socat``` - ```socat TCP-LISTEN:49721,fork UNIX-CONNECT:/var/run/docker.sock``` +``` +brew install socat +``` + ``` + socat TCP-LISTEN:49721,fork UNIX-CONNECT:/var/run/docker.sock + ``` 3. Clone current repository.