mirror of
https://github.com/pgpainless/pgpainless.git
synced 2024-09-27 18:19:34 +02:00
Fix DSL extension constructor names
This commit is contained in:
parent
9183eeb8e6
commit
8c76753eea
|
@ -14,15 +14,15 @@ class PathTest: NetworkDSL {
|
|||
private val bob = Node("1111111111111111111111111111111111111111")
|
||||
|
||||
// Root -(255, 255)-> Alice
|
||||
private val root_alice__fully_trusted = Edge(root, alice, 255, Depth.unconstrained())
|
||||
private val root_alice__fully_trusted = EdgeComponent(root, alice, 255, Depth.unconstrained())
|
||||
// Root -(60,0)-> Alice
|
||||
private val root_alice__marginally_trusted = Edge(root, alice, 60, Depth.limited(0))
|
||||
private val root_alice__marginally_trusted = EdgeComponent(root, alice, 60, Depth.limited(0))
|
||||
// Alice -(255,255)-> Root
|
||||
private val alice_root = Edge(alice, root, 255, Depth.unconstrained())
|
||||
private val alice_root = EdgeComponent(alice, root, 255, Depth.unconstrained())
|
||||
// Alice -(120, 1)-> Bob
|
||||
private val alice_bob = Edge(alice, bob)
|
||||
private val alice_bob = EdgeComponent(alice, bob)
|
||||
// Root -> Root
|
||||
private val root_root = Edge(root, root, 120, Depth.limited(1))
|
||||
private val root_root = EdgeComponent(root, root, 120, Depth.limited(1))
|
||||
|
||||
@Test
|
||||
fun `verify that an empty Path is properly initialized`() {
|
||||
|
|
|
@ -11,8 +11,8 @@ class PathsTest: NetworkDSL {
|
|||
private val alice = Node("0000000000000000000000000000000000000000")
|
||||
private val bob = Node("1111111111111111111111111111111111111111")
|
||||
|
||||
private val alice_bob_1 = Edge(alice, bob, 140, Depth.unconstrained())
|
||||
private val alice_bob_2 = Edge(alice, bob, 160, Depth.limited(1))
|
||||
private val alice_bob_1 = EdgeComponent(alice, bob, 140, Depth.unconstrained())
|
||||
private val alice_bob_2 = EdgeComponent(alice, bob, 160, Depth.limited(1))
|
||||
|
||||
@Test
|
||||
fun `verify that an empty Paths object has an amount of zero`() {
|
||||
|
|
|
@ -13,13 +13,13 @@ import java.util.*
|
|||
interface NetworkDSL {
|
||||
|
||||
/**
|
||||
* Create [Node] from [String] fingerprint.
|
||||
* Create a [Node] from a [String] fingerprint.
|
||||
*/
|
||||
fun Node(fingerprint: String): Node =
|
||||
Node(Fingerprint(fingerprint), null, RevocationState.notRevoked(), mapOf())
|
||||
|
||||
/**
|
||||
* Create [Node] from [String] fingerprint and non-revoked [userId].
|
||||
* Create a [Node] from a [String] fingerprint and non-revoked [userId].
|
||||
*/
|
||||
fun Node(fingerprint: String, userId: String): Node = Node(
|
||||
Fingerprint(fingerprint), null, RevocationState.notRevoked(), mapOf(userId to RevocationState.notRevoked()))
|
||||
|
@ -29,18 +29,18 @@ interface NetworkDSL {
|
|||
)
|
||||
|
||||
/**
|
||||
* Create [EdgeComponent] from two [Node] nodes.
|
||||
* Create an [EdgeComponent] from two [Node] nodes.
|
||||
*/
|
||||
fun Edge(issuer: Node, target: Node): EdgeComponent =
|
||||
fun EdgeComponent(issuer: Node, target: Node): EdgeComponent =
|
||||
EdgeComponent(issuer, target, null, Date())
|
||||
|
||||
/**
|
||||
* Create [EdgeComponent] from two [Node] nodes and a target [userId].
|
||||
* Create an [EdgeComponent] from two [Node] nodes and a target [userId].
|
||||
*/
|
||||
fun Edge(issuer: Node, target: Node, userId: String): EdgeComponent =
|
||||
fun EdgeComponent(issuer: Node, target: Node, userId: String): EdgeComponent =
|
||||
EdgeComponent(issuer, target, userId, Date())
|
||||
|
||||
fun Edge(issuer: Node, target: Node, amount: Int, depth: Depth): EdgeComponent =
|
||||
fun EdgeComponent(issuer: Node, target: Node, amount: Int, depth: Depth): EdgeComponent =
|
||||
EdgeComponent(issuer, target, null, Date(), null, true, amount, depth, RegexSet.wildcard())
|
||||
|
||||
/**
|
||||
|
@ -74,7 +74,7 @@ interface NetworkDSL {
|
|||
fun Network.Builder.addEdge(issuer: String, target: String): Network.Builder {
|
||||
val issuerNode = nodes[Fingerprint(issuer)]!!
|
||||
val targetNode = nodes[Fingerprint(target)]!!
|
||||
return addEdge(Edge(issuerNode, targetNode))
|
||||
return addEdge(EdgeComponent(issuerNode, targetNode))
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -85,7 +85,7 @@ interface NetworkDSL {
|
|||
fun Network.Builder.addEdge(issuer: String, target: String, userId: String): Network.Builder {
|
||||
val issuerNode = nodes[Fingerprint(issuer)]!!
|
||||
val targetNode = nodes[Fingerprint(target)]!!
|
||||
return addEdge(Edge(issuerNode, targetNode, userId))
|
||||
return addEdge(EdgeComponent(issuerNode, targetNode, userId))
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -95,7 +95,7 @@ interface NetworkDSL {
|
|||
fun Network.Builder.buildEdge(issuer: String, target: String): Network.Builder {
|
||||
val issuerNode = nodes.getOrPut(Fingerprint(issuer)) { Node(issuer) }
|
||||
val targetNode = nodes.getOrPut(Fingerprint(target)) { Node(target) }
|
||||
return addEdge(Edge(issuerNode, targetNode))
|
||||
return addEdge(EdgeComponent(issuerNode, targetNode))
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -107,7 +107,7 @@ interface NetworkDSL {
|
|||
fun Network.Builder.buildEdge(issuer: String, target: String, userId: String): Network.Builder {
|
||||
val issuerNode = nodes.getOrPut(Fingerprint(issuer)) { Node(issuer)}
|
||||
val targetNode = Node(nodes.getOrPut(Fingerprint(target)) { Node(target, userId) }, userId)
|
||||
return addEdge(Edge(issuerNode, targetNode, userId))
|
||||
return addEdge(EdgeComponent(issuerNode, targetNode, userId))
|
||||
}
|
||||
|
||||
fun Network.Builder.buildEdge(issuer: String, target: String, amount: Int, depth: Int): Network.Builder {
|
||||
|
|
Loading…
Reference in a new issue