Skip to content

Commit e50bd2f

Browse files
mversicmversic
committed
fix genesis deserialization tests
Signed-off-by: Marin Veršić <marin.versic101@gmail.com>
1 parent eeb9ad0 commit e50bd2f

File tree

20 files changed

+237
-88
lines changed

20 files changed

+237
-88
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
build/
22
.idea/
3+
.kotlin/
34
.gradle/
45
*/*/out
56

‎examples/tutorial/src/main/kotlin/jp/co/soramitsu/iroha2/Query.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ open class Query(
4747
),
4848
),
4949
)
50-
client.submit(QueryBuilder.findAssets(byAccountIdFilter).signAs(admin, keyPair))
50+
return client.submit(QueryBuilder.findAssets(byAccountIdFilter).signAs(admin, keyPair))
5151
.let { query ->
5252
query.find { it.id.definition == assetDefinitionId }?.value
5353
}.let { value ->

‎modules/block/src/test/kotlin/jp/co/soramitsu/iroha2/SerializerTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class SerializerTest {
105105
}
106106
""".trimIndent()
107107

108-
val json = JSON_SERDE.writeValueAsString(genesis.transaction).trimIndent()
108+
val json = JSON_SERDE.writeValueAsString(genesis.transaction)
109109
assertEquals(expectedJson.lowercase(), json.asPrettyJson().lowercase())
110110
}
111111

@@ -238,7 +238,7 @@ class SerializerTest {
238238
}
239239
""".trimIndent()
240240
val json = JSON_SERDE.writeValueAsString(genesis.transaction)
241-
assertEquals(expectedJson, json.asPrettyJson())
241+
assertEquals(expectedJson.lowercase(), json.asPrettyJson().lowercase())
242242
}
243243
}
244244

‎modules/client/src/test/kotlin/jp/co/soramitsu/iroha2/InstructionsTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,8 @@ class InstructionsTest : IrohaTest<Iroha2Client>() {
328328
@SdkTestId("register_asset_definition_with_store_value_type")
329329
fun `store asset`(): Unit = runBlocking {
330330
val pair1 = "key1".asName() to "bar"
331-
val pair2 = "key2".asName() to "true"
332-
val pair3 = "key3".asName() to "12345"
331+
val pair2 = "key2".asName() to true
332+
val pair3 = "key3".asName() to 12345
333333

334334
client.submit(
335335
Register.assetDefinition(DEFAULT_ASSET_DEFINITION_ID, AssetType.Store()),

‎modules/client/src/test/kotlin/jp/co/soramitsu/iroha2/QueriesTest.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,10 @@ class QueriesTest : IrohaTest<Iroha2Client>() {
463463
@SdkTestId("find_permission_tokens_by_account_id")
464464
fun `find permission tokens by account id`(): Unit = runBlocking {
465465
val result = client.submit(QueryBuilder.findPermissionsByAccountId(ALICE_ACCOUNT_ID)).filter {
466-
CanMintAssetWithDefinition("xor#wonderland".asAssetDefinitionId()) == it.payload.readValue() ||
467-
CanBurnAssetWithDefinition("xor#wonderland".asAssetDefinitionId()) == it.payload.readValue()
466+
it.name == CanMintAssetWithDefinition::class.simpleName &&
467+
CanMintAssetWithDefinition("xor#wonderland".asAssetDefinitionId()) == it.payload.readValue<CanMintAssetWithDefinition>() ||
468+
it.name == CanBurnAssetWithDefinition::class.simpleName &&
469+
CanBurnAssetWithDefinition("xor#wonderland".asAssetDefinitionId()) == it.payload.readValue<CanBurnAssetWithDefinition>()
468470
}
469471

470472
assertEquals(2, result.size)

‎modules/client/src/test/kotlin/jp/co/soramitsu/iroha2/TriggersTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ class TriggersTest : IrohaTest<Iroha2Client>() {
176176
ALICE_ACCOUNT_ID,
177177
EventFilterBox.ExecuteTrigger(ExecuteTriggerEventFilter(triggerId)),
178178
),
179-
Execute.trigger(triggerId),
179+
Execute.trigger(triggerId, null),
180180
).also { d ->
181181
withTimeout(txTimeout) { d.await() }
182182
}
@@ -297,7 +297,7 @@ class TriggersTest : IrohaTest<Iroha2Client>() {
297297
ALICE_ACCOUNT_ID,
298298
EventFilterBox.ExecuteTrigger(ExecuteTriggerEventFilter(setKeyValueTriggerId)),
299299
),
300-
Execute.trigger(setKeyValueTriggerId),
300+
Execute.trigger(setKeyValueTriggerId, null),
301301
)
302302

303303
keepNetworkBusyAndCheckAssetDefinitionIds()

‎modules/codegen/src/main/kotlin/jp/co/soramitsu/iroha2/codegen/generator/AbstractGenerator.kt‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import com.squareup.kotlinpoet.TypeName
1313
import com.squareup.kotlinpoet.TypeSpec
1414
import com.squareup.kotlinpoet.TypeVariableName
1515
import com.squareup.kotlinpoet.WildcardTypeName
16+
import jp.co.soramitsu.iroha2.ModelCustomInstruction
1617
import jp.co.soramitsu.iroha2.ModelPermission
1718
import jp.co.soramitsu.iroha2.codegen.blueprint.Blueprint
1819
import jp.co.soramitsu.iroha2.generated.InstructionBox
@@ -124,25 +125,19 @@ abstract class AbstractGenerator<T : Blueprint<*>> {
124125
}
125126

126127
open fun implFunctions(blueprint: T, clazz: TypeSpec.Builder) {
127-
if (blueprint.className.startsWith("RegisterOf")) {
128-
clazz.addFunction(asInstructionBoxFun())
129-
} else if (blueprint.className.startsWith("UnregisterOf")) {
130-
clazz.addFunction(asInstructionBoxFun())
131-
} else if (blueprint.className.startsWith("SetKeyValueOf")) {
132-
clazz.addFunction(asInstructionBoxFun())
133-
} else if (blueprint.className.startsWith("RemoveKeyValueOf")) {
134-
clazz.addFunction(asInstructionBoxFun())
135-
} else if (blueprint.className.startsWith("MintOf")) {
136-
clazz.addFunction(asInstructionBoxFun())
137-
} else if (blueprint.className.startsWith("BurnOf")) {
138-
clazz.addFunction(asInstructionBoxFun())
139-
} else if (blueprint.className.startsWith("TransferOf")) {
140-
clazz.addFunction(asInstructionBoxFun())
141-
} else if (blueprint.className.startsWith("GrantOf")) {
142-
clazz.addFunction(asInstructionBoxFun())
143-
} else if (blueprint.className.startsWith("RevokeOf")) {
144-
clazz.addFunction(asInstructionBoxFun())
145-
} else if (blueprint.className == "ExecuteTrigger") {
128+
if (blueprint.className.startsWith("RegisterOf") ||
129+
blueprint.className.startsWith("UnregisterOf") ||
130+
blueprint.className.startsWith("SetKeyValueOf") ||
131+
blueprint.className.startsWith("RemoveKeyValueOf") ||
132+
blueprint.className.startsWith("MintOf") ||
133+
blueprint.className.startsWith("BurnOf") ||
134+
blueprint.className.startsWith("TransferOf") ||
135+
blueprint.className.startsWith("GrantOf") ||
136+
blueprint.className.startsWith("RevokeOf") ||
137+
blueprint.className == "Upgrade" ||
138+
blueprint.className == "SetParameter" ||
139+
blueprint.className == "ExecuteTrigger"
140+
) {
146141
clazz.addFunction(asInstructionBoxFun())
147142
}
148143
}
@@ -158,25 +153,25 @@ abstract class AbstractGenerator<T : Blueprint<*>> {
158153
open fun implSuperClasses(blueprint: T, clazz: TypeSpec.Builder) {
159154
if (blueprint.className.startsWith("Can")) {
160155
clazz.addSuperinterface(ModelPermission::class)
161-
} else if (blueprint.className.startsWith("RegisterOf")) {
162-
clazz.addSuperinterface(Instruction::class)
163-
} else if (blueprint.className.startsWith("UnregisterOf")) {
164-
clazz.addSuperinterface(Instruction::class)
165-
} else if (blueprint.className.startsWith("SetKeyValueOf")) {
166-
clazz.addSuperinterface(Instruction::class)
167-
} else if (blueprint.className.startsWith("RemoveKeyValueOf")) {
168-
clazz.addSuperinterface(Instruction::class)
169-
} else if (blueprint.className.startsWith("MintOf")) {
170-
clazz.addSuperinterface(Instruction::class)
171-
} else if (blueprint.className.startsWith("BurnOf")) {
172-
clazz.addSuperinterface(Instruction::class)
173-
} else if (blueprint.className.startsWith("TransferOf")) {
174-
clazz.addSuperinterface(Instruction::class)
175-
} else if (blueprint.className.startsWith("GrantOf")) {
176-
clazz.addSuperinterface(Instruction::class)
177-
} else if (blueprint.className.startsWith("RevokeOf")) {
178-
clazz.addSuperinterface(Instruction::class)
179-
} else if (blueprint.className == "ExecuteTrigger") {
156+
} else if (
157+
blueprint.className == "MultisigRegister" ||
158+
blueprint.className == "MultisigPropose" ||
159+
blueprint.className == "MultisigApprove"
160+
) {
161+
clazz.addSuperinterface(ModelCustomInstruction::class)
162+
} else if (blueprint.className.startsWith("RegisterOf") ||
163+
blueprint.className.startsWith("UnregisterOf") ||
164+
blueprint.className.startsWith("SetKeyValueOf") ||
165+
blueprint.className.startsWith("RemoveKeyValueOf") ||
166+
blueprint.className.startsWith("MintOf") ||
167+
blueprint.className.startsWith("BurnOf") ||
168+
blueprint.className.startsWith("TransferOf") ||
169+
blueprint.className.startsWith("GrantOf") ||
170+
blueprint.className.startsWith("RevokeOf") ||
171+
blueprint.className == "Upgrade" ||
172+
blueprint.className == "SetParameter" ||
173+
blueprint.className == "ExecuteTrigger"
174+
) {
180175
clazz.addSuperinterface(Instruction::class)
181176
}
182177
}

‎modules/model/src/main/kotlin/jp/co/soramitsu/iroha2/Extensions.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,3 +348,8 @@ fun RevokeOfRoleIdAndAccount.asInstructionBoxExt() = InstructionBox.Revoke(Revok
348348
fun RevokeOfPermissionAndRole.asInstructionBoxExt() = InstructionBox.Revoke(RevokeBox.RolePermission(this))
349349

350350
fun ExecuteTrigger.asInstructionBoxExt() = InstructionBox.ExecuteTrigger(this)
351+
352+
fun Upgrade.asInstructionBoxExt() = InstructionBox.Upgrade(this)
353+
fun SetParameter.asInstructionBoxExt() = InstructionBox.SetParameter(this)
354+
355+
fun <I : ModelCustomInstruction> I.asInstructionBoxExt() = InstructionBox.Custom(CustomInstruction(Json.writeValue(this)))

‎modules/model/src/main/kotlin/jp/co/soramitsu/iroha2/ModelCustomInstruction.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package jp.co.soramitsu.iroha2
2+
3+
interface ModelCustomInstruction

‎modules/model/src/main/kotlin/jp/co/soramitsu/iroha2/ModelParameter.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package jp.co.soramitsu.iroha2
2+
3+
interface ModelParameter

0 commit comments

Comments
 (0)