aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei-Ning Huang <w@byzantine-lab.io>2019-09-30 21:50:11 +0800
committerWei-Ning Huang <w@byzantine-lab.io>2019-09-30 21:55:01 +0800
commit1d0b0be9ef39e4e15d249f49ccece3574a788f6a (patch)
tree54457a40fc174e953356cd212b5bc8b6c88a7804
parent989f662336288dd7f548e0737bc55df0274c05e4 (diff)
downloadgo-tangerine-w-debug.tar
go-tangerine-w-debug.tar.gz
go-tangerine-w-debug.tar.bz2
go-tangerine-w-debug.tar.lz
go-tangerine-w-debug.tar.xz
go-tangerine-w-debug.tar.zst
go-tangerine-w-debug.zip
-rw-r--r--dex/handler.go10
-rw-r--r--vendor/github.com/tangerine-network/tangerine-consensus/core/configuration-chain.go4
-rw-r--r--vendor/github.com/tangerine-network/tangerine-consensus/core/consensus.go10
3 files changed, 14 insertions, 10 deletions
diff --git a/dex/handler.go b/dex/handler.go
index 1c87d322c..b34e2eba0 100644
--- a/dex/handler.go
+++ b/dex/handler.go
@@ -1383,16 +1383,16 @@ func (pm *ProtocolManager) peerSetLoop() {
if newRound == round+1 {
pm.peers.BuildConnection(newRound)
- if round >= 1 {
- pm.peers.ForgetConnection(round - 1)
- }
+ //if round >= 1 {
+ // pm.peers.ForgetConnection(round - 1)
+ //}
} else if newRound == round && reset+1 == newReset {
- pm.peers.ForgetLabelConnection(peerLabel{set: notaryset, round: round})
+ //pm.peers.ForgetLabelConnection(peerLabel{set: notaryset, round: round})
pm.gov.PurgeNotarySet(newRound)
pm.peers.BuildConnection(newRound)
} else {
// just forget all network connection and rebuild.
- pm.peers.ForgetConnection(round)
+ //pm.peers.ForgetConnection(round)
if newRound >= 1 {
pm.peers.BuildConnection(newRound - 1)
diff --git a/vendor/github.com/tangerine-network/tangerine-consensus/core/configuration-chain.go b/vendor/github.com/tangerine-network/tangerine-consensus/core/configuration-chain.go
index de863b45f..26d0ca7c4 100644
--- a/vendor/github.com/tangerine-network/tangerine-consensus/core/configuration-chain.go
+++ b/vendor/github.com/tangerine-network/tangerine-consensus/core/configuration-chain.go
@@ -499,6 +499,7 @@ func (cc *configurationChain) runDKG(
default:
}
+ cc.logger.Info("## RunDKG", "phase", cc.dkg.step)
err := cc.dkgRunPhases[cc.dkg.step](round, reset)
if err == nil || err == ErrSkipButNoError {
err = nil
@@ -510,6 +511,9 @@ func (cc *configurationChain) runDKG(
"error", err)
}
}
+ if err != nil {
+ cc.logger.Info("## RunDKG error", "phase", cc.dkg.step, "err", err)
+ }
if err != nil && dkgError == nil {
dkgError = err
}
diff --git a/vendor/github.com/tangerine-network/tangerine-consensus/core/consensus.go b/vendor/github.com/tangerine-network/tangerine-consensus/core/consensus.go
index 9af7a4484..7191ac581 100644
--- a/vendor/github.com/tangerine-network/tangerine-consensus/core/consensus.go
+++ b/vendor/github.com/tangerine-network/tangerine-consensus/core/consensus.go
@@ -422,7 +422,7 @@ func (recv *consensusDKGReceiver) ProposeDKGComplaint(
recv.logger.Error("Failed to sign DKG complaint", "error", err)
return
}
- recv.logger.Debug("Calling Governace.AddDKGComplaint",
+ recv.logger.Info("Calling Governace.AddDKGComplaint",
"complaint", complaint)
recv.gov.AddDKGComplaint(complaint)
}
@@ -434,7 +434,7 @@ func (recv *consensusDKGReceiver) ProposeDKGMasterPublicKey(
recv.logger.Error("Failed to sign DKG master public key", "error", err)
return
}
- recv.logger.Debug("Calling Governance.AddDKGMasterPublicKey", "key", mpk)
+ recv.logger.Info("Calling Governance.AddDKGMasterPublicKey", "key", mpk)
recv.gov.AddDKGMasterPublicKey(mpk)
}
@@ -483,7 +483,7 @@ func (recv *consensusDKGReceiver) ProposeDKGMPKReady(ready *typesDKG.MPKReady) {
recv.logger.Error("Failed to sign DKG ready", "error", err)
return
}
- recv.logger.Debug("Calling Governance.AddDKGMPKReady", "ready", ready)
+ recv.logger.Info("Calling Governance.AddDKGMPKReady", "ready", ready)
recv.gov.AddDKGMPKReady(ready)
}
@@ -493,7 +493,7 @@ func (recv *consensusDKGReceiver) ProposeDKGFinalize(final *typesDKG.Finalize) {
recv.logger.Error("Failed to sign DKG finalize", "error", err)
return
}
- recv.logger.Debug("Calling Governance.AddDKGFinalize", "final", final)
+ recv.logger.Info("Calling Governance.AddDKGFinalize", "final", final)
recv.gov.AddDKGFinalize(final)
}
@@ -503,7 +503,7 @@ func (recv *consensusDKGReceiver) ProposeDKGSuccess(success *typesDKG.Success) {
recv.logger.Error("Failed to sign DKG successize", "error", err)
return
}
- recv.logger.Debug("Calling Governance.AddDKGSuccess", "success", success)
+ recv.logger.Info("Calling Governance.AddDKGSuccess", "success", success)
recv.gov.AddDKGSuccess(success)
}