Skip to content
Snippets Groups Projects
Commit 968f5022 authored by CamilleC's avatar CamilleC
Browse files

add protocole filter - not finished

parent f5dda6fd
Branches
Tags
1 merge request!285node's list header
......@@ -119,6 +119,8 @@ function NetworkModalController($scope, $q, $translate, $timeout, $ionicPopover,
$scope.display='members';
$scope.screen = UIUtils.screen;
$scope.nbMembersPeers = 0;
$scope.esPeersOnly = false;
csCurrency.all()
.then(function (currencies) {
......@@ -134,7 +136,7 @@ function NetworkModalController($scope, $q, $translate, $timeout, $ionicPopover,
BMA.instance(currency.peer.host, currency.peer.port) : BMA;
if ($scope.loadingPeers){
csNetwork.start($scope.node);
csNetwork.start($scope.node, $scope.esPeersOnly);
// Catch event on new peers
var refreshing = false;
......
......@@ -160,6 +160,7 @@ function SettingsController($scope, $q, $ionicPopup, $timeout, $translate, csHtt
return;
}
var parts = node.split(':');
parts[1] = parts[1] ? parts[1] : 80;
resolve({
host: parts[0],
port: parts[1]
......
......@@ -18,7 +18,8 @@ angular.module('cesium.network.services', ['ngResource', 'ngApi', 'cesium.bma.se
mainBuid: null,
uidsByPubkeys: null,
updatingPeers: true,
searchingPeersOnNetwork: false
searchingPeersOnNetwork: false,
esPeersOnly: false
},
resetData = function() {
......@@ -205,6 +206,7 @@ angular.module('cesium.network.services', ['ngResource', 'ngApi', 'cesium.bma.se
var mainBlock = _.max(buids, function(obj) {
return obj.count;
});
_.forEach(data.peers, function(peer){
peer.hasMainConsensusBlock = peer.buid == mainBlock.buid;
peer.hasConsensusBlock = !peer.hasMainConsensusBlock && currents[peer.buid] > 1;
......@@ -212,6 +214,10 @@ angular.module('cesium.network.services', ['ngResource', 'ngApi', 'cesium.bma.se
data.peers = _.uniq(data.peers, false, function(peer) {
return peer.pubkey;
});
if(data.esPeersOnly) {
var regex = /^BASIC_MERKLED_API/;
data.peers = _.filter(data.peers, function(peer){return regex.test(peer.endpoints);})
};
data.peers = _.sortBy(data.peers, function(peer) {
var score = 1;
score += (100000000 * (peer.online ? 1 : 0));
......@@ -276,7 +282,8 @@ angular.module('cesium.network.services', ['ngResource', 'ngApi', 'cesium.bma.se
});
},
start = function(bma) {
start = function(bma, filterOn) {
data.esPeersOnly = filterOn;
return $q(function(resolve, reject) {
close();
data.bma = bma ? bma : BMA;
......
......@@ -135,6 +135,7 @@ function ESPluginSettingsController ($scope, $q, $translate, $ionicPopup, UIUti
return;
}
var parts = node.split(':');
parts[1] = parts[1] ? parts[1] : 80;
resolve({
host: parts[0],
port: parts[1]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment