StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

formatting with new ktlint (#312)

Browse Source
This commit is contained in:
Vyacheslav
2023-09-29 15:18:47 +03:00
committed by GitHub
parent 517430bb22
commit dbf5a21960
191 changed files with 769 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/kotlin/io/emeraldpay/dshackle/auth/processor/AuthProcessorResolverTest.kt
View File

@@ -19,7 +19,7 @@ class AuthProcessorResolverTest {
"joiVjEifQ.BZILN0GQ7JzXGFz-GZIbFTT9E5L-miB4Nga0v4o_cQThk8gbDelBRzEfdsqxCq_ppPr3v_Own8M-vR9yQElx5nEdlI4xe5QAMdIvr3g" +
"12fMckydX9IsW4sVQ1kJJY8RrHb-WL-uI0WSWqoMSwf-Psb-UyiEHAjc3oK7fA72lBaGT4waPHOxRBPvezwg7N934vCZvZMAftFfVgmeEtbCeD7bF" +
"umEr0uEmkIKPTg4QwP-VMvqoLBYpMiJVzP_Ipg_wRHJ7fUN0BGEPjjMvhQ_6TWByiQUBz1kTMd0Ebf_kEuXFQeiwA-FXHJpWczzh66CbbmmWAWsi" +
"ehKw3KPZeBj0oQ"
"ehKw3KPZeBj0oQ",
)
val processor = authProcessorResolver.getAuthProcessor(token)
@@ -32,7 +32,7 @@ class AuthProcessorResolverTest {
"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJkcnBjIiwiaWF0IjoxNjkyMTg5NTUzfQ.sQ1Q3DFC7kOlHWdnWaxv2F" +
"vhGso6ajJQVWtrE1hYmL_AIH_Lz8LNpqFShlL2itEGfmyRz5-Vrbdf-yWjeyLyNDlf7pay2lNE5Pvm2-EtQd8GUYcCFFIz7Sxc2Iphe2" +
"YIx6kBwSlaR0RXBcmUlOtKrnON0bBNzSojBmtCT7-j4hTpoKhYr04Fr9EJWHfw7grVZjU8rEizAX_SR3ZNoufjK_pZaIyI9qUKVPYSepP" +
"lXtQzVjA80qSeYpkeFCOLwlQD_yTArDNWlwe7-CthtBOAtctoTMwyudfJezT2ilXrigzbauzU5BEi1cNxacHpjNuXhyY0TiacJGugWfRgaaGy6g"
"lXtQzVjA80qSeYpkeFCOLwlQD_yTArDNWlwe7-CthtBOAtctoTMwyudfJezT2ilXrigzbauzU5BEi1cNxacHpjNuXhyY0TiacJGugWfRgaaGy6g",
)
val e = assertThrows(StatusException::class.java) { authProcessorResolver.getAuthProcessor(token) }
@@ -46,7 +46,7 @@ class AuthProcessorResolverTest {
"mG3Z-h9P1DlocTKZ3BpAKNdsvRGjXo71I0GUpUemAnauUaH-OgxUOHlNcZ2uB4f1poEWsbpExeuZ15YAiBf2WBCEV6J6xH1u0cPC1O-8" +
"hHNb46166ngzo-BtZ7Rn7FeVEayyICslc9iXM5GvoFJyJIdn9uLMzalyDJq2bUmIelym4edkQ3ybF-pqf8garuVVErnAsbOFXbYQlfO5ZJ" +
"4zq6PfJo7QSkreMzQ4tK_-JJIGG-EK1bQjsAD7JiXipY2cJY17VlHuavI0DfcJlOe-QggbTH63rxL6JvXCyFux7gI7zdqSBP1fNDJNzTLA" +
"cnR7jCN0kMIa8urQgdePZyRg"
"cnR7jCN0kMIa8urQgdePZyRg",
)
val e = assertThrows(StatusException::class.java) { authProcessorResolver.getAuthProcessor(token) }

11
src/test/kotlin/io/emeraldpay/dshackle/auth/processor/AuthProcessorV1Test.kt
View File

@@ -28,10 +28,11 @@ import java.time.Instant
class AuthProcessorV1Test {
private val processor = AuthProcessorV1(
AuthorizationConfig(
true, "drpc",
true,
"drpc",
AuthorizationConfig.ServerConfig.default(),
AuthorizationConfig.ClientConfig.default()
)
AuthorizationConfig.ClientConfig.default(),
),
)
private val rsaKeyReader = RsaKeyReader()
private val privProviderPath = ResourceUtils.getFile("classpath:keys/priv.p8.key").path
@@ -65,7 +66,7 @@ class AuthProcessorV1Test {
val e = assertThrows(StatusException::class.java) { processor.process(keyPair, token) }
assertEquals(
"INVALID_ARGUMENT: Invalid token: The Token's Signature resulted invalid when verified using the Algorithm: SHA256withRSA",
e.message
e.message,
)
}
@@ -80,7 +81,7 @@ class AuthProcessorV1Test {
val e = assertThrows(StatusException::class.java) { processor.process(keyPair, invalidToken) }
assertEquals(
"INVALID_ARGUMENT: Invalid token: The Claim 'iss' value doesn't match the required issuer.",
e.message
e.message,
)
}

33
src/test/kotlin/io/emeraldpay/dshackle/auth/service/AuthServiceTest.kt
View File

@@ -41,15 +41,20 @@ class AuthServiceTest {
@Test
fun `auth is successful`() {
val tokenWrapper = AuthContext.TokenWrapper(
"token", Instant.now(), "sessionId"
"token",
Instant.now(),
"sessionId",
)
val authService = AuthService(
AuthorizationConfig(
true, "drpc",
true,
"drpc",
AuthorizationConfig.ServerConfig("privPath", "pubPath"),
AuthorizationConfig.ClientConfig.default()
AuthorizationConfig.ClientConfig.default(),
),
rsaKeyReader, factory, authContext
rsaKeyReader,
factory,
authContext,
)
val pair = KeyReader.Keys(mock(PrivateKey::class.java), mock(PublicKey::class.java))
@@ -66,19 +71,26 @@ class AuthServiceTest {
@Test
fun `parallel try to auth is successful`() {
val tokenWrapper = AuthContext.TokenWrapper(
"token", Instant.now(), "sessionId"
"token",
Instant.now(),
"sessionId",
)
val tokenWrapper1 = AuthContext.TokenWrapper(
"token", Instant.now(), "sessionIdNext"
"token",
Instant.now(),
"sessionIdNext",
)
val pair = KeyReader.Keys(mock(PrivateKey::class.java), mock(PublicKey::class.java))
val authService = AuthService(
AuthorizationConfig(
true, "drpc",
true,
"drpc",
AuthorizationConfig.ServerConfig("privPath", "pubPath"),
AuthorizationConfig.ClientConfig.default()
AuthorizationConfig.ClientConfig.default(),
),
rsaKeyReader, factory, authContext
rsaKeyReader,
factory,
authContext,
)
`when`(rsaKeyReader.getKeyPair("privPath", "pubPath")).thenReturn(pair)
@@ -89,7 +101,8 @@ class AuthServiceTest {
val task = Runnable { authService.authenticate(token) }
CompletableFuture.allOf(
CompletableFuture.runAsync(task), CompletableFuture.runAsync(task)
CompletableFuture.runAsync(task),
CompletableFuture.runAsync(task),
).join()
verify(rsaKeyReader, times(2)).getKeyPair("privPath", "pubPath")

6
src/test/kotlin/io/emeraldpay/dshackle/auth/service/RsaKeyReaderTest.kt
View File

@@ -35,7 +35,7 @@ class RsaKeyReaderTest {
"650627570641542946773123818063304222185205897480168513227047010620610697362185901253798594085716467" +
"92700927695491574061920135297311257486773262784524717857554194798974994838378321973611865011031457" +
"8859834631052697211398759550437148562864384448640344034211059348047816397935347753413946137935402" +
"562264627177210569215727831448291731093608051334025332988696191"
"562264627177210569215727831448291731093608051334025332988696191",
)
publicExponent == pubExponent && modulus == pubModulus
}
@@ -50,7 +50,7 @@ class RsaKeyReaderTest {
"2072047577218574632871804997852794886795318485439021501388394533101191305015940756335545719496" +
"04557847518214006893286271137213491059994279470633688916032797849945887259137876037521925382454" +
"762238089597912107394417801381736627011587603418078578130206830219321107525729614610300336784925" +
"6741484379041499791605663418628739419306248595872949"
"6741484379041499791605663418628739419306248595872949",
)
val privExponent = BigInteger(
"2704777724417882789147602456408780048462378556719441898242139736695157047955437327090684858" +
@@ -59,7 +59,7 @@ class RsaKeyReaderTest {
"7744591423894125208163912446945277960899800043458394321204754817284255735206518583285355872405" +
"3966258052672146605639969648388744960700258048094135244952249403403074548577386549705289154261" +
"2346391566526533514196717633725503640437930121313225102536030460301806443109607461162231878852" +
"64869837629637060803692577216204745443259318662678133769"
"64869837629637060803692577216204745443259318662678133769",
)
privateExponent == privExponent && modulus == privModulus

20
src/test/kotlin/io/emeraldpay/dshackle/rpc/NativeCallStreamTest.kt
View File

@@ -37,7 +37,7 @@ class NativeCallStreamTest {
val req = Mono.just(
NativeCallRequest.newBuilder()
.setChunkSize(1000)
.build()
.build(),
)
val result = nativeCallStream.nativeCall(req)
@@ -65,7 +65,7 @@ class NativeCallStreamTest {
val req = Mono.just(
NativeCallRequest.newBuilder()
.setChunkSize(5)
.build()
.build(),
)
val chunkResponse: (Int) -> BlockchainOuterClass.NativeCallReplyItem.Builder = { id ->
@@ -82,18 +82,18 @@ class NativeCallStreamTest {
.expectNext(
chunkResponse(15)
.setPayload(ByteString.copyFrom("\"0x11".toByteArray()))
.build()
.build(),
)
.expectNext(
chunkResponse(15)
.setPayload(ByteString.copyFrom("26938".toByteArray()))
.build()
.build(),
)
.expectNext(
chunkResponse(15)
.setFinalChunk(true)
.setPayload(ByteString.copyFrom("\"".toByteArray()))
.build()
.build(),
)
.expectComplete()
.verify(Duration.ofSeconds(3))
@@ -115,14 +115,14 @@ class NativeCallStreamTest {
val req = Mono.just(
NativeCallRequest.newBuilder()
.setChunkSize(1000)
.build()
.build(),
)
val result = nativeCallStream.nativeCall(req)
StepVerifier.create(result)
.expectNext(
nativeCallResponse
nativeCallResponse,
)
.expectComplete()
.verify(Duration.ofSeconds(3))
@@ -145,7 +145,9 @@ class NativeCallStreamTest {
}
val nativeCallMock = mock<NativeCall> {
on { nativeCall(any()) } doReturn Flux.just(
nativeCallResponse(1, response), nativeCallResponse(2, response2), nativeCallResponse(3, response3)
nativeCallResponse(1, response),
nativeCallResponse(2, response2),
nativeCallResponse(3, response3),
).flatMap {
when (it.id) {
1 -> Mono.just(it).delayElement(Duration.ofMillis(200))
@@ -158,7 +160,7 @@ class NativeCallStreamTest {
val req = Mono.just(
NativeCallRequest.newBuilder()
.setSorted(true)
.build()
.build(),
)
val result = nativeCallStream.nativeCall(req)

44
src/test/kotlin/io/emeraldpay/dshackle/rpc/SelectorsTest.kt
View File

@@ -21,42 +21,42 @@ internal class SelectorsTest {
return Stream.of(
Arguments.of(
Selector.newBuilder().setLabelSelector(leafLabelSelector).build(),
null
null,
),
Arguments.of(
Selector.newBuilder().setShouldBeForwarded(true)
.setLabelSelector(leafLabelSelector).build(),
Selector.newBuilder().setShouldBeForwarded(true)
.setLabelSelector(leafLabelSelector).build()
.setLabelSelector(leafLabelSelector).build(),
),
Arguments.of(
Selector.newBuilder().setOrSelector(OrSelector.newBuilder()).build(),
null
null,
),
Arguments.of(
Selector.newBuilder().setShouldBeForwarded(true)
.setOrSelector(OrSelector.newBuilder()).build(),
null
null,
),
Arguments.of(
Selector.newBuilder().setShouldBeForwarded(true)
.setOrSelector(
OrSelector.newBuilder().addSelectors(
Selector.newBuilder().setLabelSelector(leafLabelSelector)
)
Selector.newBuilder().setLabelSelector(leafLabelSelector),
),
).build(),
null
null,
),
Arguments.of(
Selector.newBuilder().setShouldBeForwarded(true)
.setOrSelector(
OrSelector.newBuilder().addSelectors(
Selector.newBuilder().setShouldBeForwarded(true)
.setLabelSelector(leafLabelSelector)
)
.setLabelSelector(leafLabelSelector),
),
).build(),
Selector.newBuilder().setShouldBeForwarded(true)
.setLabelSelector(leafLabelSelector).build()
.setLabelSelector(leafLabelSelector).build(),
),
Arguments.of(
Selector.newBuilder().setShouldBeForwarded(true)
@@ -64,14 +64,14 @@ internal class SelectorsTest {
OrSelector.newBuilder()
.addSelectors(Selector.newBuilder().setShouldBeForwarded(true).setLabelSelector(leafLabelSelector))
.addSelectors(Selector.newBuilder().setShouldBeForwarded(true).setLabelSelector(leafLabelSelector))
.addSelectors(Selector.newBuilder().setLabelSelector(leafLabelSelector))
.addSelectors(Selector.newBuilder().setLabelSelector(leafLabelSelector)),
).build(),
Selector.newBuilder().setShouldBeForwarded(true)
.setOrSelector(
OrSelector.newBuilder()
.addSelectors(Selector.newBuilder().setShouldBeForwarded(true).setLabelSelector(leafLabelSelector))
.addSelectors(Selector.newBuilder().setShouldBeForwarded(true).setLabelSelector(leafLabelSelector))
).build()
.addSelectors(Selector.newBuilder().setShouldBeForwarded(true).setLabelSelector(leafLabelSelector)),
).build(),
),
Arguments.of(
Selector.newBuilder().setShouldBeForwarded(true)
@@ -79,35 +79,35 @@ internal class SelectorsTest {
AndSelector.newBuilder()
.addSelectors(Selector.newBuilder().setShouldBeForwarded(true).setLabelSelector(leafLabelSelector))
.addSelectors(Selector.newBuilder().setShouldBeForwarded(true).setLabelSelector(leafLabelSelector))
.addSelectors(Selector.newBuilder().setLabelSelector(leafLabelSelector))
.addSelectors(Selector.newBuilder().setLabelSelector(leafLabelSelector)),
).build(),
Selector.newBuilder().setShouldBeForwarded(true)
.setAndSelector(
AndSelector.newBuilder()
.addSelectors(Selector.newBuilder().setShouldBeForwarded(true).setLabelSelector(leafLabelSelector))
.addSelectors(Selector.newBuilder().setShouldBeForwarded(true).setLabelSelector(leafLabelSelector))
).build()
.addSelectors(Selector.newBuilder().setShouldBeForwarded(true).setLabelSelector(leafLabelSelector)),
).build(),
),
Arguments.of(
Selector.newBuilder().setShouldBeForwarded(true)
.setNotSelector(
NotSelector.newBuilder()
.setSelector(Selector.newBuilder().setShouldBeForwarded(true).setLabelSelector(leafLabelSelector))
.setSelector(Selector.newBuilder().setShouldBeForwarded(true).setLabelSelector(leafLabelSelector)),
).build(),
Selector.newBuilder().setShouldBeForwarded(true)
.setNotSelector(
NotSelector.newBuilder()
.setSelector(Selector.newBuilder().setShouldBeForwarded(true).setLabelSelector(leafLabelSelector))
).build()
.setSelector(Selector.newBuilder().setShouldBeForwarded(true).setLabelSelector(leafLabelSelector)),
).build(),
),
Arguments.of(
Selector.newBuilder().setShouldBeForwarded(true)
.setNotSelector(
NotSelector.newBuilder()
.setSelector(Selector.newBuilder().setLabelSelector(leafLabelSelector))
.setSelector(Selector.newBuilder().setLabelSelector(leafLabelSelector)),
).build(),
null
)
null,
),
)
}

25
src/test/kotlin/io/emeraldpay/dshackle/upstream/grpc/auth/GrpcUpstreamsAuthTest.kt
View File

@@ -32,9 +32,10 @@ class GrpcUpstreamsAuthTest {
private val providerPublicKeyPath = ResourceUtils.getFile("classpath:keys/public.pem").path
private val grpcAuthContext = GrpcAuthContext()
private val authConfig = AuthorizationConfig(
true, "drpc",
true,
"drpc",
AuthorizationConfig.ServerConfig.default(),
AuthorizationConfig.ClientConfig(privateKeyPath)
AuthorizationConfig.ClientConfig(privateKeyPath),
)
private val providerPrivateKeyPath = ResourceUtils.getFile("classpath:keys/priv.p8.key").path
@@ -60,8 +61,8 @@ class GrpcUpstreamsAuthTest {
Mono.just(
AuthOuterClass.AuthResponse.newBuilder()
.setProviderToken(token)
.build()
)
.build(),
),
)
val result = grpcAuth.auth(upstreamId)
@@ -90,8 +91,8 @@ class GrpcUpstreamsAuthTest {
Mono.just(
AuthOuterClass.AuthResponse.newBuilder()
.setProviderToken(token)
.build()
)
.build(),
),
)
val result = grpcAuth.auth(providerId)
@@ -100,8 +101,8 @@ class GrpcUpstreamsAuthTest {
.expectNext(
GrpcUpstreamsAuth.AuthResult(
false,
"Error during auth - The Token's Signature resulted invalid when verified using the Algorithm: SHA256withRSA"
)
"Error during auth - The Token's Signature resulted invalid when verified using the Algorithm: SHA256withRSA",
),
)
.then {
assertEquals(null, grpcAuthContext.getToken(upstreamId))
@@ -129,15 +130,15 @@ class GrpcUpstreamsAuthTest {
Mono.just(
AuthOuterClass.AuthResponse.newBuilder()
.setProviderToken(token)
.build()
)
.build(),
),
)
.thenReturn(
Mono.just(
AuthOuterClass.AuthResponse.newBuilder()
.setProviderToken(token1)
.build()
)
.build(),
),
)
grpcAuth.auth(providerId).block()