idk/muwire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change connection event to carry an endpoint

Browse Source
This commit is contained in:
Zlatin Balevsky
2018-07-25 18:54:07 +01:00
parent 1b629a8f0a
commit b0b9430479
3 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/groovy/com/muwire/core/connection/ConnectionEvent.groovy
View File

@@ -6,7 +6,8 @@ import net.i2p.data.Destination
class ConnectionEvent extends Event { class ConnectionEvent extends Event {
Destination destination Endpoint endpoint
boolean incoming
ConnectionAttemptStatus status ConnectionAttemptStatus status
} }

7
core/src/main/groovy/com/muwire/core/hostcache/HostCache.groovy
View File

@@ -53,10 +53,11 @@ class HostCache extends Service {
} }
void onConnectionEvent(ConnectionEvent e) { void onConnectionEvent(ConnectionEvent e) {
Host host = hosts.get(e.destination) Destination dest = e.endpoint.destination
Host host = hosts.get(dest)
if (host == null) { if (host == null) {
host = new Host(e.destination) host = new Host(dest)
hosts.put(e.destination, host) hosts.put(dest, host)
} }
switch(e.status) { switch(e.status) {

19
core/src/test/groovy/com/muwire/core/hostcache/HostCacheTest.groovy
View File

@@ -8,6 +8,7 @@ import com.muwire.core.Destinations
import com.muwire.core.MuWireSettings import com.muwire.core.MuWireSettings
import com.muwire.core.connection.ConnectionAttemptStatus import com.muwire.core.connection.ConnectionAttemptStatus
import com.muwire.core.connection.ConnectionEvent import com.muwire.core.connection.ConnectionEvent
import com.muwire.core.connection.Endpoint
import com.muwire.core.trust.TrustLevel import com.muwire.core.trust.TrustLevel
import com.muwire.core.trust.TrustService import com.muwire.core.trust.TrustService
@@ -143,9 +144,10 @@ class HostCacheTest {
initMocks() initMocks()
cache.onHostDiscoveredEvent(new HostDiscoveredEvent(destination: destinations.dest1)) cache.onHostDiscoveredEvent(new HostDiscoveredEvent(destination: destinations.dest1))
cache.onConnectionEvent( new ConnectionEvent(destination: destinations.dest1, status: ConnectionAttemptStatus.FAILED)) def endpoint = new Endpoint(destinations.dest1, null, null)
cache.onConnectionEvent( new ConnectionEvent(destination: destinations.dest1, status: ConnectionAttemptStatus.FAILED)) cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.FAILED))
cache.onConnectionEvent( new ConnectionEvent(destination: destinations.dest1, status: ConnectionAttemptStatus.FAILED)) cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.FAILED))
cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.FAILED))
assert cache.getHosts(5).size() == 0 assert cache.getHosts(5).size() == 0
} }
@@ -164,11 +166,12 @@ class HostCacheTest {
initMocks() initMocks()
cache.onHostDiscoveredEvent(new HostDiscoveredEvent(destination: destinations.dest1)) cache.onHostDiscoveredEvent(new HostDiscoveredEvent(destination: destinations.dest1))
cache.onConnectionEvent( new ConnectionEvent(destination: destinations.dest1, status: ConnectionAttemptStatus.FAILED)) def endpoint = new Endpoint(destinations.dest1, null, null)
cache.onConnectionEvent( new ConnectionEvent(destination: destinations.dest1, status: ConnectionAttemptStatus.FAILED)) cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.FAILED))
cache.onConnectionEvent( new ConnectionEvent(destination: destinations.dest1, status: ConnectionAttemptStatus.SUCCESSFUL)) cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.FAILED))
cache.onConnectionEvent( new ConnectionEvent(destination: destinations.dest1, status: ConnectionAttemptStatus.FAILED)) cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.FAILED))
cache.onConnectionEvent( new ConnectionEvent(destination: destinations.dest1, status: ConnectionAttemptStatus.FAILED)) cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.SUCCESSFUL))
cache.onConnectionEvent( new ConnectionEvent(endpoint: endpoint, status: ConnectionAttemptStatus.FAILED))
def rv = cache.getHosts(5) def rv = cache.getHosts(5)
assert rv.size() == 1 assert rv.size() == 1