Merge "[FAB-3179] Fix staticcheck issues in sbft package"

hyperledger · Apr 22, 2017 · d39dee5 · d39dee5
2 parents 4bd6d27 + 9a64721
commit d39dee5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/orderer/sbft/backend/backend.go b/orderer/sbft/backend/backend.go
@@ -468,7 +468,7 @@ func Sign(privateKey crypto.PrivateKey, data []byte) []byte {
  if err != nil {
  panic(err)
  }
- encsig, err = asn1.Marshal(struct{ R, S *big.Int }{r, s})
+ encsig, _ = asn1.Marshal(struct{ R, S *big.Int }{r, s})
  default:
  panic("Unsupported private key type given.")
  }

diff --git a/orderer/sbft/connection/connection.go b/orderer/sbft/connection/connection.go
@@ -56,7 +56,7 @@ func New(addr string, certFile string, keyFile string) (_ *Manager, err error) {
  }
 
  c.Cert = &cert
- c.Self, err = NewPeerInfo("", cert.Certificate[0])
+ c.Self, _ = NewPeerInfo("", cert.Certificate[0])
 
  c.tlsConfig = &tls.Config{
  Certificates: []tls.Certificate{cert},

diff --git a/orderer/sbft/simplebft/newview_test.go b/orderer/sbft/simplebft/newview_test.go
@@ -118,7 +118,7 @@ func TestXsetByz0(t *testing.T) {
  },
  }
 
- xset, _, ok := s.makeXset(vcs)
+ _, _, ok := s.makeXset(vcs)
  if ok {
  t.Error("should not have received an xset")
  }
@@ -131,7 +131,7 @@ func TestXsetByz0(t *testing.T) {
  Checkpoint: s.makeBatch(2, []byte("prev"), nil),
  })
 
- xset, _, ok = s.makeXset(vcs)
+ xset, _, ok := s.makeXset(vcs)
  if !ok {
  t.Error("no xset")
  }
@@ -164,7 +164,7 @@ func TestXsetByz2(t *testing.T) {
  },
  }
 
- xset, _, ok := s.makeXset(vcs)
+ _, _, ok := s.makeXset(vcs)
  if ok {
  t.Error("should not have received an xset")
  }
@@ -176,7 +176,7 @@ func TestXsetByz2(t *testing.T) {
  Checkpoint: s.makeBatch(1, []byte("prev"), nil),
  })
 
- xset, _, ok = s.makeXset(vcs)
+ xset, _, ok := s.makeXset(vcs)
  if !ok {
  t.Error("no xset")
  }