Merge "FAB-2200 - do not hardcode local MSP ID"

hyperledger · Feb 24, 2017 · bb5a53f · bb5a53f
2 parents c116f4d + 9d67ddd
commit bb5a53f
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/peer/main.go b/peer/main.go
@@ -102,12 +102,6 @@ func main() {
  // Init the MSP
  var mspMgrConfigDir = viper.GetString("peer.mspConfigPath")
  var mspID = viper.GetString("peer.localMspId")
-
- if mspID != "DEFAULT" { // FIXME: remove this line as soon as GOSSIP GETS the MSP ID from the genesis block
- logger.Warning("Setting mspID to DEFAULT as temporary workaround") // FIXME: remove this line as soon as GOSSIP GETS the MSP ID from the genesis block
- mspID = "DEFAULT" // FIXME: remove this line as soon as GOSSIP GETS the MSP ID from the genesis block
- } // FIXME: remove this line as soon as GOSSIP GETS the MSP ID from the genesis block
-
  err = common.InitCrypto(mspMgrConfigDir, mspID)
  if err != nil { // Handle errors reading the config file
  panic(err.Error())