Fixed : getNextSupernode and getPrevSupernode return object bug
This commit is contained in:
sairajzero 2019-11-16 01:20:50 +05:30
parent 466d0d621b
commit c6383a6f8f

View File

@ -5238,7 +5238,7 @@
if (!isFloIdUint8) if (!isFloIdUint8)
flo_addr = this.floIdToKbucketId(flo_addr); flo_addr = this.floIdToKbucketId(flo_addr);
const KA = KB.toArray(); const KA = KB.toArray();
let pos = KA.indexOf(flo_addr) let pos = KB._indexOf(KB.root,flo_addr)
var prevSupernode = [] var prevSupernode = []
for(var i = 0; i < n; i++){ for(var i = 0; i < n; i++){
if(pos - i < 0) if(pos - i < 0)
@ -5261,7 +5261,7 @@
if (!isFloIdUint8) if (!isFloIdUint8)
flo_addr = this.floIdToKbucketId(flo_addr); flo_addr = this.floIdToKbucketId(flo_addr);
const KA = KB.toArray(); const KA = KB.toArray();
let pos = KA.indexOf(flo_addr) let pos = KB._indexOf(KB.root,flo_addr)
var nextSupernode = [] var nextSupernode = []
for(var i = 0; i < n; i++){ for(var i = 0; i < n; i++){
if(pos + i >= KA.length) if(pos + i >= KA.length)
@ -6076,6 +6076,7 @@
function initIndexedDBforSupernodeDataStorage(floID){ function initIndexedDBforSupernodeDataStorage(floID){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
var indexesList = ["senderID","receiverID","pubKey","message","sign","application","type","comment"]; var indexesList = ["senderID","receiverID","pubKey","message","sign","application","type","comment"];
var storageList = floGlobals.storageList
var idbObj = {} var idbObj = {}
for(var i=0;i<storageList.length;i++){ for(var i=0;i<storageList.length;i++){
idbObj[storageList[i]] = { idbObj[storageList[i]] = {
@ -6131,13 +6132,16 @@
resolve("Connected to all backup nodes") resolve("Connected to all backup nodes")
else{ else{
floSupernode.kBucket.getNextSupernode(curNode).then(nextBackupNode => { floSupernode.kBucket.getNextSupernode(curNode).then(nextBackupNode => {
connectToBackupSupernode(nextBackupNode).then(backupConn => { if(nextBackupNode[0].floID != myFloID){
floGlobals.backupNodes[i] = backupConn connectToBackupSupernode(nextBackupNode[0].floID).then(backupConn => {
connectToAllBackupSupernode(backupConn.floID, i+1) floGlobals.backupNodes[i] = backupConn
.then(result => resolve(result)) connectToAllBackupSupernode(backupConn.floID, i+1)
.catch(error => reject(error)) .then(result => resolve(result))
}) .catch(error => reject(error))
}).catch(error => console.log(error)) })
}else
reject("No more supernodes available")
}).catch(error => reject(error))
} }
}) })
@ -6150,7 +6154,7 @@
.catch(error => { .catch(error => {
console.log(error) console.log(error)
floSupernode.kBucket.getNextSupernode(backupNodeID).then(nextBackupNode => { floSupernode.kBucket.getNextSupernode(backupNodeID).then(nextBackupNode => {
connectToBackupSupernode(nextBackupNode).then(result => resolve(result)) connectToBackupSupernode(nextBackupNode[0].floID).then(result => resolve(result))
}).catch(error => console.log(error)) }).catch(error => console.log(error))
}) })
}) })