Skip to content

Commit

Permalink
Merge pull request #113 from ERussel/fix/grpc-duplication
Browse files Browse the repository at this point in the history
fix grpc duplication symbols
  • Loading branch information
ERussel authored Sep 26, 2019
2 parents ca2309d + d181e15 commit a9cc766
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
4 changes: 2 additions & 2 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -69,4 +69,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 29089a97c3781ec366ef8266addf4289525ff849

COCOAPODS: 1.7.5
COCOAPODS: 1.8.0
2 changes: 1 addition & 1 deletion IrohaCommunication.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <GRPCClient/GRPCCall+Tests.h>
#import <IrohaCrypto/NSData+Hex.h>

@interface IRNetworkService()
Expand Down
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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.

Expand Down

0 comments on commit a9cc766

Please sign in to comment.