style fixes

Signed-off-by: Russel <[email protected]>
hyperledger-iroha · Sep 12, 2019 · 3a0e2fc · 3a0e2fc
1 parent 8cb4e17
commit 3a0e2fc
Show file tree

Hide file tree

Showing 131 changed files with 547 additions and 538 deletions.
diff --git a/IntegrationTests/IrohaContainer/IRIrohaContainer.h b/IntegrationTests/IrohaContainer/IRIrohaContainer.h
@@ -9,10 +9,10 @@
 
 @interface IRIrohaContainer : NSObject
 
-@property(nonatomic, readonly)IRNetworkService * _Nonnull iroha;
+@property (nonatomic, readonly) IRNetworkService * _Nonnull iroha;
 
 + (nonnull instancetype)shared;
-- (nullable NSError*)start;
-- (nullable NSError*)stop;
+- (nullable NSError *)start;
+- (nullable NSError *)stop;
 
 @end
diff --git a/IntegrationTests/IrohaContainer/IRIrohaContainer.m b/IntegrationTests/IrohaContainer/IRIrohaContainer.m
@@ -17,8 +17,8 @@
 
 @interface IRIrohaContainer()
 
-@property(strong, nonatomic)NSURLSession *session;
-@property(strong, nonatomic)IRNetworkService *irohaService;
+@property (nonatomic, strong) NSURLSession *session;
+@property (nonatomic, strong) IRNetworkService *irohaService;
 
 @end
 
@@ -101,7 +101,7 @@ - (nullable NSError *)start {
     return resultError;
 }
 
-- (nullable NSError*)stop {
+- (nullable NSError *)stop {
     dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
 
     __block NSError *resultError;
@@ -180,7 +180,7 @@ - (nonnull NSURLRequest*)createContainerStopRequest {
 
 #pragma mark - Response
 
-- (nullable NSError*)handleRestartResponse:(nonnull NSURLResponse *)response
+- (nullable NSError *)handleRestartResponse:(nonnull NSURLResponse *)response
                                       data:(nullable NSData *)data
                              receivedError:(nullable NSError *)receivedError {
     if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
@@ -209,10 +209,10 @@ - (nullable NSError*)handleRestartResponse:(nonnull NSURLResponse *)response
     return [IRIrohaContainer errorForMessage:@"Unexpected response received during restart"];
 }
 
-- (nullable NSString*)handleTaskPreparationResponse:(nonnull NSURLResponse *)response
+- (nullable NSString *)handleTaskPreparationResponse:(nonnull NSURLResponse *)response
                                            data:(nullable NSData *)data
                                       receivedError:(nullable NSError *)receivedError
-                                        resultError:(NSError*_Nullable*_Nullable)resultError {
+                                        resultError:(NSError *_Nullable*_Nullable)resultError {
     if (data) {
         NSDictionary *result = [NSJSONSerialization JSONObjectWithData:data
                                                                options:0
@@ -239,7 +239,7 @@ - (nullable NSString*)handleTaskPreparationResponse:(nonnull NSURLResponse *)res
     }
 }
 
-- (nullable NSError*)handleTaskExecutionResponse:(nonnull NSURLResponse *)response
+- (nullable NSError *)handleTaskExecutionResponse:(nonnull NSURLResponse *)response
                                             data:(nullable NSData *)data
                                    receivedError:(nullable NSError *)receivedError {
     if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
@@ -268,7 +268,7 @@ - (nullable NSError*)handleTaskExecutionResponse:(nonnull NSURLResponse *)respon
     return [IRIrohaContainer errorForMessage:@"Unexpected response received on try to run iroha daemon"];
 }
 
-- (nullable NSError*)handleStopResponse:(nonnull NSURLResponse *)response
+- (nullable NSError *)handleStopResponse:(nonnull NSURLResponse *)response
                                    data:(nullable NSData *)data
                           receivedError:(nullable NSError *)receivedError {
     if ([response isKindOfClass:[NSHTTPURLResponse class]]) {
@@ -312,7 +312,7 @@ - (BOOL)checkConnectivity {
         dispatch_semaphore_signal(semaphore);
 
         return nil;
-    }).onError(^IRPromise * _Nullable(NSError* error) {
+    }).onError(^IRPromise * _Nullable(NSError * error) {
         dispatch_semaphore_signal(semaphore);
 
         return nil;
@@ -325,7 +325,7 @@ - (BOOL)checkConnectivity {
 
 #pragma mark - Helper
 
-+ (nonnull NSError *)errorForMessage:(nonnull NSString*)message {
++ (nonnull NSError *)errorForMessage:(nonnull NSString *)message {
     NSString *domain = [NSString stringWithFormat:@"co.jp.soramitsu.iroha.%@", NSStringFromClass([IRIrohaContainer class])];
     return [NSError errorWithDomain:domain
                                code:0

diff --git a/IntegrationTests/Scenarious/IRAccountRestoreWithBatchTest.m b/IntegrationTests/Scenarious/IRAccountRestoreWithBatchTest.m
@@ -8,15 +8,15 @@
 
 @interface IRAccountRestoreWithBatchTest : IRBaseIrohaContainerTests
 
-@property(strong, nonatomic)id<IRRoleName> userRole;
-@property(strong, nonatomic)id<IRDomain> bankDomain;
-@property(strong, nonatomic)id<IRDomain> recoveryDomain;
-@property(strong, nonatomic)id<IRAccountId> recoveryAccount;
-@property(strong, nonatomic)id<IRCryptoKeypairProtocol> recoveryKeypair;
-@property(strong, nonatomic)id<IRSignatureCreatorProtocol> recoverySigner;
-@property(strong, nonatomic)id<IRAccountId> clientAccount;
-@property(strong, nonatomic)id<IRCryptoKeypairProtocol> clientKeypair;
-@property(strong, nonatomic)id<IRSignatureCreatorProtocol> clientSigner;
+@property (strong, nonatomic) id<IRRoleName> userRole;
+@property (strong, nonatomic) id<IRDomain> bankDomain;
+@property (strong, nonatomic) id<IRDomain> recoveryDomain;
+@property (strong, nonatomic) id<IRAccountId> recoveryAccount;
+@property (strong, nonatomic) id<IRCryptoKeypairProtocol> recoveryKeypair;
+@property (strong, nonatomic) id<IRSignatureCreatorProtocol> recoverySigner;
+@property (strong, nonatomic) id<IRAccountId> clientAccount;
+@property (strong, nonatomic) id<IRCryptoKeypairProtocol> clientKeypair;
+@property (strong, nonatomic) id<IRSignatureCreatorProtocol> clientSigner;
 
 @end
 
@@ -71,7 +71,7 @@ - (void)testAccountRestoreScenarioWithoutBatch {
         [expectation fulfill];
 
         return nil;
-    }).onError(^IRPromise* _Nullable (NSError* error) {
+    }).onError(^IRPromise* _Nullable (NSError * error) {
         XCTFail(@"%@", error);
 
         [expectation fulfill];
@@ -105,7 +105,7 @@ - (void)testAccountRestoreScenarioWithBatch {
         [expectation fulfill];
 
         return nil;
-    }).onError(^IRPromise* _Nullable (NSError* error) {
+    }).onError(^IRPromise* _Nullable (NSError * error) {
         XCTFail(@"%@", error);
 
         [expectation fulfill];

diff --git a/IntegrationTests/Scenarious/IRCreateAccountTest.m b/IntegrationTests/Scenarious/IRCreateAccountTest.m
@@ -78,7 +78,7 @@ - (void)testCreateAccount {
         [expectation fulfill];
 
         return nil;
-    }).onError(^IRPromise * _Nullable(NSError* error) {
+    }).onError(^IRPromise * _Nullable(NSError * error) {
         XCTFail();
         NSLog(@"%@",error);
 

diff --git a/IntegrationTests/Scenarious/IRCreateDomainTest.m b/IntegrationTests/Scenarious/IRCreateDomainTest.m
@@ -46,7 +46,7 @@ - (void)testCreateDomain {
     }).onThen(^IRPromise * _Nullable(id result) {
         [expectation fulfill];
         return nil;
-    }).onError(^IRPromise * _Nullable(NSError* error) {
+    }).onError(^IRPromise * _Nullable(NSError * error) {
         NSLog(@"%@", error);
         XCTFail();
 

diff --git a/IntegrationTests/Scenarious/IRCreateRoleTest.m b/IntegrationTests/Scenarious/IRCreateRoleTest.m
@@ -63,7 +63,7 @@ - (void)testCreateRoleRejected {
         [expectation fulfill];
 
         return nil;
-    }).onError(^IRPromise* _Nullable (NSError* error) {
+    }).onError(^IRPromise* _Nullable (NSError * error) {
         XCTFail();
         NSLog(@"%@",error);
 

diff --git a/IntegrationTests/Scenarious/IRGetAccountDetailTest.m b/IntegrationTests/Scenarious/IRGetAccountDetailTest.m
@@ -105,7 +105,7 @@ - (void)testGetAccountDetailInSeveralPages {
         [expectation fulfill];
 
         return nil;
-    }).onError(^IRPromise * _Nullable(NSError* error) {
+    }).onError(^IRPromise * _Nullable(NSError * error) {
         XCTFail();
         NSLog(@"%@",error);
 

diff --git a/IrohaCommunication/Classes/Private/Commands/IRAddAssetQuantity.m b/IrohaCommunication/Classes/Private/Commands/IRAddAssetQuantity.m
@@ -22,7 +22,7 @@ - (nonnull instancetype)initWithAssetId:(nonnull id<IRAssetId>)assetId
 
 #pragma mark - Protobuf Transformable
 
-- (nullable id)transform:(NSError**)error {
+- (nullable id)transform:(NSError **)error {
     AddAssetQuantity *assetQuantity = [[AddAssetQuantity alloc] init];
     assetQuantity.assetId = [_assetId identifier];
     assetQuantity.amount = [_amount value];

diff --git a/IrohaCommunication/Classes/Private/Commands/IRSetAccountDetail.h b/IrohaCommunication/Classes/Private/Commands/IRSetAccountDetail.h
@@ -10,7 +10,7 @@
 @interface IRSetAccountDetail : NSObject<IRSetAccountDetail, IRProtobufTransformable>
 
 - (nonnull instancetype)initWithAccountId:(nonnull id<IRAccountId>)accountId
-                                      key:(nonnull NSString*)key
-                                    value:(nonnull NSString*)value;
+                                      key:(nonnull NSString *)key
+                                    value:(nonnull NSString *)value;
 
 @end
diff --git a/IrohaCommunication/Classes/Private/Commands/IRSetAccountDetail.m b/IrohaCommunication/Classes/Private/Commands/IRSetAccountDetail.m
@@ -12,8 +12,8 @@ @implementation IRSetAccountDetail
 @synthesize value = _value;
 
 - (nonnull instancetype)initWithAccountId:(nonnull id<IRAccountId>)accountId
-                                      key:(nonnull NSString*)key
-                                    value:(nonnull NSString*)value {
+                                      key:(nonnull NSString *)key
+                                    value:(nonnull NSString *)value {
 
     if (self = [super init]) {
         _accountId = accountId;

diff --git a/IrohaCommunication/Classes/Private/Commands/IRTransferAsset.h b/IrohaCommunication/Classes/Private/Commands/IRTransferAsset.h
@@ -12,7 +12,7 @@
 - (nonnull instancetype)initWithSourceAccountId:(nonnull id<IRAccountId>)sourceAccountId
                            destinationAccountId:(nonnull id<IRAccountId>)destinationAccountId
                                         assetId:(nonnull id<IRAssetId>)assetId
-                            transferDescription:(nonnull NSString*)transferDescription
+                            transferDescription:(nonnull NSString *)transferDescription
                                          amount:(nonnull id<IRAmount>)amount;
 
 @end
diff --git a/IrohaCommunication/Classes/Private/Commands/IRTransferAsset.m b/IrohaCommunication/Classes/Private/Commands/IRTransferAsset.m
@@ -16,7 +16,7 @@ @implementation IRTransferAsset
 - (nonnull instancetype)initWithSourceAccountId:(nonnull id<IRAccountId>)sourceAccountId
                            destinationAccountId:(nonnull id<IRAccountId>)destinationAccountId
                                         assetId:(nonnull id<IRAssetId>)assetId
-                            transferDescription:(nonnull NSString*)transferDescription
+                            transferDescription:(nonnull NSString *)transferDescription
                                          amount:(nonnull id<IRAmount>)amount {
 
     if (self = [super init]) {

diff --git a/IrohaCommunication/Classes/Private/IRBlockQueryRequestImpl.h b/IrohaCommunication/Classes/Private/IRBlockQueryRequestImpl.h
@@ -15,7 +15,7 @@ typedef NS_ENUM(NSUInteger, IRQueryRequestError) {
 @interface IRBlockQueryRequest : NSObject<IRBlockQueryRequest, IRProtobufTransformable>
 
 - (nonnull instancetype)initWithCreator:(nonnull id<IRAccountId>)creator
-                              createdAt:(nonnull NSDate*)createdAt
+                              createdAt:(nonnull NSDate *)createdAt
                            queryCounter:(UInt64)queryCounter
                           peerSignature:(nullable id<IRPeerSignature>)peerSignature;
 

diff --git a/IrohaCommunication/Classes/Private/IRBlockQueryRequestImpl.m b/IrohaCommunication/Classes/Private/IRBlockQueryRequestImpl.m
@@ -17,7 +17,7 @@ @implementation IRBlockQueryRequest
 @synthesize peerSignature = _peerSignature;
 
 - (nonnull instancetype)initWithCreator:(nonnull id<IRAccountId>)creator
-                              createdAt:(nonnull NSDate*)createdAt
+                              createdAt:(nonnull NSDate *)createdAt
                            queryCounter:(UInt64)queryCounter
                           peerSignature:(nullable id<IRPeerSignature>)peerSignature {
 
@@ -35,7 +35,7 @@ - (nonnull instancetype)initWithCreator:(nonnull id<IRAccountId>)creator
 
 - (nullable instancetype)signedWithSignatory:(nonnull id<IRSignatureCreatorProtocol>)signatory
                           signatoryPublicKey:(nonnull id<IRPublicKeyProtocol>)signatoryPublicKey
-                                       error:(NSError**)error {
+                                       error:(NSError **)error {
 
     id<IRPeerSignature> peerSignature = [self signWithSignatory:signatory
                                              signatoryPublicKey:signatoryPublicKey
@@ -78,7 +78,7 @@ - (nullable instancetype)signedWithSignatory:(nonnull id<IRSignatureCreatorProto
 
 #pragma mark - Protobuf Transformables
 
-- (nullable id)transform:(NSError*_Nullable*_Nullable)error {
+- (nullable id)transform:(NSError *_Nullable*_Nullable)error {
     QueryPayloadMeta *payload = [self createPayload:error];
 
     if (!payload) {
@@ -101,7 +101,7 @@ - (nullable id)transform:(NSError*_Nullable*_Nullable)error {
 
 #pragma mark - Private
 
-- (nullable QueryPayloadMeta*)createPayload:(NSError**)error {
+- (nullable QueryPayloadMeta*)createPayload:(NSError **)error {
     QueryPayloadMeta *meta = [[QueryPayloadMeta alloc] init];
     meta.creatorAccountId = [_creator identifier];
     meta.createdTime = [_createdAt milliseconds];
@@ -112,7 +112,7 @@ - (nullable QueryPayloadMeta*)createPayload:(NSError**)error {
 
 - (nullable id<IRSignatureProtocol>)signPayload:(nonnull QueryPayloadMeta*)payload
                                       signatory:(nonnull id<IRSignatureCreatorProtocol>)signatory
-                                          error:(NSError**)error {
+                                          error:(NSError **)error {
     NSData *payloadData = [payload data];
 
     if (!payloadData) {
@@ -151,7 +151,7 @@ - (nullable QueryPayloadMeta*)createPayload:(NSError**)error {
 
 #pragma mark - Helpers
 
-+ (nonnull NSError*)errorWithType:(IRQueryRequestError)errorType message:(nonnull NSString*)message {
++ (nonnull NSError *)errorWithType:(IRQueryRequestError)errorType message:(nonnull NSString *)message {
     return [NSError errorWithDomain:NSStringFromClass([IRBlockQueryRequest class])
                                code:errorType
                            userInfo:@{NSLocalizedDescriptionKey: message}];

diff --git a/IrohaCommunication/Classes/Private/IRProtobufTransformable.h b/IrohaCommunication/Classes/Private/IRProtobufTransformable.h
@@ -8,7 +8,7 @@
 
 @protocol IRProtobufTransformable <NSObject>
 
-- (nullable id)transform:(NSError*_Nullable*_Nullable)error;
+- (nullable id)transform:(NSError *_Nullable*_Nullable)error;
 
 @end
 

diff --git a/IrohaCommunication/Classes/Private/IRQueryRequestImpl.h b/IrohaCommunication/Classes/Private/IRQueryRequestImpl.h
@@ -15,7 +15,7 @@ typedef NS_ENUM(NSUInteger, IRQueryRequestError) {
 @interface IRQueryRequest : NSObject<IRQueryRequest, IRProtobufTransformable>
 
 - (nonnull instancetype)initWithCreator:(nonnull id<IRAccountId>)creator
-                              createdAt:(nonnull NSDate*)createdAt
+                              createdAt:(nonnull NSDate *)createdAt
                                   query:(nonnull id<IRQuery>)query
                            queryCounter:(UInt64)queryCounter
                           peerSignature:(nullable id<IRPeerSignature>)peerSignature;

diff --git a/IrohaCommunication/Classes/Private/IRQueryRequestImpl.m b/IrohaCommunication/Classes/Private/IRQueryRequestImpl.m
@@ -18,7 +18,7 @@ @implementation IRQueryRequest
 @synthesize peerSignature = _peerSignature;
 
 - (nonnull instancetype)initWithCreator:(nonnull id<IRAccountId>)creator
-                              createdAt:(nonnull NSDate*)createdAt
+                              createdAt:(nonnull NSDate *)createdAt
                                   query:(nonnull id<IRQuery>)query
                            queryCounter:(UInt64)queryCounter
                           peerSignature:(nullable id<IRPeerSignature>)peerSignature {
@@ -38,7 +38,7 @@ - (nonnull instancetype)initWithCreator:(nonnull id<IRAccountId>)creator
 
 - (nullable instancetype)signedWithSignatory:(nonnull id<IRSignatureCreatorProtocol>)signatory
                           signatoryPublicKey:(nonnull id<IRPublicKeyProtocol>)signatoryPublicKey
-                                       error:(NSError**)error {
+                                       error:(NSError **)error {
 
     id<IRPeerSignature> peerSignature = [self signWithSignatory:signatory
                                              signatoryPublicKey:signatoryPublicKey
@@ -82,7 +82,7 @@ - (nullable instancetype)signedWithSignatory:(nonnull id<IRSignatureCreatorProto
 
 #pragma mark - Protobuf Transformables
 
-- (nullable id)transform:(NSError*_Nullable*_Nullable)error {
+- (nullable id)transform:(NSError *_Nullable*_Nullable)error {
     Query_Payload *payload = [self createPayload:error];
 
     if (!payload) {
@@ -105,7 +105,7 @@ - (nullable id)transform:(NSError*_Nullable*_Nullable)error {
 
 #pragma mark - Private
 
-- (nullable Query_Payload*)createPayload:(NSError**)error {
+- (nullable Query_Payload*)createPayload:(NSError **)error {
     if (![_query conformsToProtocol:@protocol(IRProtobufTransformable)]) {
         if (error) {
             NSString *message = [NSString stringWithFormat:@"%@ query must conform %@",
@@ -136,7 +136,7 @@ - (nullable Query_Payload*)createPayload:(NSError**)error {
 
 - (nullable id<IRSignatureProtocol>)signPayload:(nonnull Query_Payload*)payload
                                       signatory:(nonnull id<IRSignatureCreatorProtocol>)signatory
-                                          error:(NSError**)error {
+                                          error:(NSError **)error {
     NSData *payloadData = [payload data];
 
     if (!payloadData) {
@@ -175,7 +175,7 @@ - (nullable Query_Payload*)createPayload:(NSError**)error {
 
 #pragma mark - Helpers
 
-+ (nonnull NSError*)errorWithType:(IRQueryRequestError)errorType message:(nonnull NSString*)message {
++ (nonnull NSError *)errorWithType:(IRQueryRequestError)errorType message:(nonnull NSString *)message {
     return [NSError errorWithDomain:NSStringFromClass([IRQueryRequest class])
                                code:errorType
                            userInfo:@{NSLocalizedDescriptionKey: message}];

diff --git a/IrohaCommunication/Classes/Private/IRQueryResponse+Proto.h b/IrohaCommunication/Classes/Private/IRQueryResponse+Proto.h
@@ -18,6 +18,6 @@ typedef NS_ENUM(NSUInteger, IRQueryResponseFactoryError) {
 @interface IRQueryResponseProtoFactory : NSObject
 
 + (nullable id<IRQueryResponse>)responseFromProtobuf:(nonnull QueryResponse*)pbResponse
-                                               error:(NSError*_Nullable*_Nullable)error;
+                                               error:(NSError *_Nullable*_Nullable)error;
 
 @end
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ @@
     @protocol IRProtobufTransformable <NSObject>
-    - (nullable id)transform:(NSError*_Nullable*_Nullable)error;
+    - (nullable id)transform:(NSError *_Nullable*_Nullable)error;
     @end
@@ Expand Down @@