Skip to content

Commit

Permalink
Merge pull request #77 from hyperledger/feature/rebase
Browse files Browse the repository at this point in the history
Rebasing master branch with develop for further develop->master merge
  • Loading branch information
unklayman authored Jan 24, 2019
2 parents 5f0e786 + c984cd1 commit bd4f70e
Show file tree
Hide file tree
Showing 228 changed files with 0 additions and 0 deletions.
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified Example/IntegrationTestHost-Info.plist
100644 → 100755
Empty file.
Empty file modified Example/IntegrationTestHost/ViewController.swift
100644 → 100755
Empty file.
Empty file modified Example/IntegrationTests-Info.plist
100644 → 100755
Empty file.
Empty file modified Example/IrohaCommunication.xcodeproj/project.pbxproj
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified Example/IrohaCommunication.xcworkspace/contents.xcworkspacedata
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified Example/IrohaExample/AppDelegate.swift
100644 → 100755
Empty file.
Empty file.
Empty file modified Example/IrohaExample/Assets.xcassets/Contents.json
100644 → 100755
Empty file.
Empty file modified Example/IrohaExample/Base.lproj/LaunchScreen.storyboard
100644 → 100755
Empty file.
Empty file modified Example/IrohaExample/Base.lproj/Main.storyboard
100644 → 100755
Empty file.
Empty file modified Example/IrohaExample/Error+String.swift
100644 → 100755
Empty file.
Empty file modified Example/IrohaExample/Info.plist
100644 → 100755
Empty file.
Empty file modified Example/IrohaExample/ViewController.swift
100644 → 100755
Empty file.
Empty file modified Example/Podfile
100644 → 100755
Empty file.
Empty file modified Example/Podfile.lock
100644 → 100755
Empty file.
Empty file modified Example/Tests/Tests-Info.plist
100644 → 100755
Empty file.
Empty file modified Example/Tests/Tests-Prefix.pch
100644 → 100755
Empty file.
Empty file modified Example/Tests/en.lproj/InfoPlist.strings
100644 → 100755
Empty file.
Empty file modified IntegrationTests/Config/[email protected]
100644 → 100755
Empty file.
Empty file modified IntegrationTests/Config/[email protected]
100644 → 100755
Empty file.
Empty file modified IntegrationTests/Config/config.docker
100644 → 100755
Empty file.
Empty file modified IntegrationTests/Config/genesis.block
100644 → 100755
Empty file.
Empty file modified IntegrationTests/Config/node0.priv
100644 → 100755
Empty file.
Empty file modified IntegrationTests/Config/node0.pub
100644 → 100755
Empty file.
Empty file modified IntegrationTests/IrohaContainer/IRBaseIrohaContainerTests.h
100644 → 100755
Empty file.
Empty file modified IntegrationTests/IrohaContainer/IRBaseIrohaContainerTests.m
100644 → 100755
Empty file.
Empty file modified IntegrationTests/IrohaContainer/IRIrohaContainer.h
100644 → 100755
Empty file.
Empty file modified IntegrationTests/IrohaContainer/IRIrohaContainer.m
100644 → 100755
Empty file.
Empty file modified IntegrationTests/Scenarious/IRCreateAccountTest.m
100644 → 100755
Empty file.
Empty file modified IntegrationTests/Scenarious/IRCreateAssetTest.m
100644 → 100755
Empty file.
Empty file modified IntegrationTests/Scenarious/IRCreateDomainTest.m
100644 → 100755
Empty file.
Empty file modified IntegrationTests/Scenarious/IRCreateRoleTest.m
100644 → 100755
Empty file.
Empty file modified IntegrationTests/Service/IRCancellableTests.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Assets/.gitkeep
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/.gitkeep
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRAddPeer.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRAddPeer.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRAddSignatory.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRAddSignatory.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRAppendRole.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRAppendRole.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRCommandAll.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRCreateAccount.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRCreateAccount.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRCreateAsset.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRCreateAsset.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRCreateDomain.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRCreateDomain.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRCreateRole.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRCreateRole.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRDetachRole.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRDetachRole.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRGrantPermission.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRGrantPermission.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRRemoveSignatory.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRRemoveSignatory.m
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRTransferAsset.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Commands/IRTransferAsset.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/IRBlockQueryRequestImpl.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/IRBlockQueryRequestImpl.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/IRProtobufTransformable.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/IRQueryRequestImpl.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/IRQueryRequestImpl.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/IRQueryResponse+Proto.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/IRQueryResponse+Proto.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/IRTransactionImpl+Proto.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/IRTransactionImpl+Proto.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/IRTransactionImpl.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/IRTransactionImpl.m
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Models/IRBlock+Proto.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Models/IRBlock+Proto.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Models/IRBlockImpl.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Models/IRBlockImpl.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Models/IRCommand+Proto.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Models/IRCommand+Proto.m
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRGetAccount.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRGetAccount.m
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRGetAccountAssets.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRGetAccountAssets.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRGetAccountDetail.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRGetAccountDetail.m
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRGetAssetInfo.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRGetAssetInfo.m
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRGetRoles.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRGetRoles.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRGetSignatories.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRGetSignatories.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRGetTransactions.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRGetTransactions.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Queries/IRQueryAll.h
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Responses/IRAssetResponse.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Responses/IRAssetResponse.m
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Responses/IRErrorResponse.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Responses/IRErrorResponse.m
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Responses/IRRolesResponse.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Private/Responses/IRRolesResponse.m
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Builder/IRBlockQueryBuilder.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Builder/IRBlockQueryBuilder.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Builder/IRQueryBuilder.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Builder/IRQueryBuilder.m
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRAccountAsset.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRAccountAsset.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRAccountId.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRAccountId.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRAddress.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRAddress.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRAmount.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRAmount.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRAssetId.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRAssetId.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRDomain.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRDomain.m
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRPagination.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRPagination.m
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRRoleName.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/Common/IRRoleName.m
100644 → 100755
Empty file.
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/IRBlockQueryRequest.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/IRBlockQueryResponse.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/IRCommand.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/IRQuery.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/IRQueryRequest.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/IRQueryResponse.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/IRSignable.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Model/IRTransaction.h
100644 → 100755
Empty file.
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Promise/IRPromise.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Promise/IRPromise.m
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Service/IRCancellable.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Service/IRNetworkService.h
100644 → 100755
Empty file.
Empty file modified IrohaCommunication/Classes/Public/Service/IRNetworkService.m
100644 → 100755
Empty file.
Empty file modified LICENSE
100644 → 100755
Empty file.
Empty file modified ProtoGen/Block.pbobjc.h
100644 → 100755
Empty file.
Empty file modified ProtoGen/Block.pbobjc.m
100644 → 100755
Empty file.
Empty file modified ProtoGen/Commands.pbobjc.h
100644 → 100755
Empty file.
Empty file modified ProtoGen/Commands.pbobjc.m
100644 → 100755
Empty file.
Empty file modified ProtoGen/Endpoint.pbobjc.h
100644 → 100755
Empty file.
Empty file modified ProtoGen/Endpoint.pbobjc.m
100644 → 100755
Empty file.
Empty file modified ProtoGen/Endpoint.pbrpc.h
100644 → 100755
Empty file.
Empty file modified ProtoGen/Endpoint.pbrpc.m
100644 → 100755
Empty file.
Empty file modified ProtoGen/Primitive.pbobjc.h
100644 → 100755
Empty file.
Empty file modified ProtoGen/Primitive.pbobjc.m
100644 → 100755
Empty file.
Empty file modified ProtoGen/Proposal.pbobjc.h
100644 → 100755
Empty file.
Empty file modified ProtoGen/Proposal.pbobjc.m
100644 → 100755
Empty file.
Empty file modified ProtoGen/QryResponses.pbobjc.h
100644 → 100755
Empty file.
Empty file modified ProtoGen/QryResponses.pbobjc.m
100644 → 100755
Empty file.
Empty file modified ProtoGen/Queries.pbobjc.h
100644 → 100755
Empty file.
Empty file modified ProtoGen/Queries.pbobjc.m
100644 → 100755
Empty file.
Empty file modified ProtoGen/Transaction.pbobjc.h
100644 → 100755
Empty file.
Empty file modified ProtoGen/Transaction.pbobjc.m
100644 → 100755
Empty file.
Empty file modified README.md
100644 → 100755
Empty file.
Empty file modified SwiftyIroha.podspec
100644 → 100755
Empty file.
Empty file modified Tests/Model/IRAccountAssetTests.m
100644 → 100755
Empty file.
Empty file modified Tests/Model/IRAccountIdTests.m
100644 → 100755
Empty file.
Empty file modified Tests/Model/IRAddressTests.m
100644 → 100755
Empty file.
Empty file modified Tests/Model/IRAmountTests.m
100644 → 100755
Empty file.
Empty file modified Tests/Model/IRAssetIdTests.m
100644 → 100755
Empty file.
Empty file modified Tests/Model/IRDomainTests.m
100644 → 100755
Empty file.
Empty file modified Tests/Model/IRGrantablePermissionTests.m
100644 → 100755
Empty file.
Empty file modified Tests/Model/IRPaginationTests.m
100644 → 100755
Empty file.
Empty file modified Tests/Model/IRRoleNameTests.m
100644 → 100755
Empty file.
Empty file modified Tests/Model/IRRolePermissionTests.m
100644 → 100755
Empty file.
Empty file modified Tests/Promise/IRPromiseTests.m
100644 → 100755
Empty file.
Empty file modified Tests/Query/IRBlockQueryBuilderTests.m
100644 → 100755
Empty file.
Empty file modified Tests/Query/IRQueryBuilderTests.m
100644 → 100755
Empty file.
Empty file modified Tests/Transaction/IRTransactionTests.m
100644 → 100755
Empty file.

0 comments on commit bd4f70e

Please sign in to comment.