Merge pull request #6 from cloudstruct/feature/golangci-lint

Configure golangci-lint CI workflow

Author: agaffney

.github/workflows/golangci-lint.yml

@@ -0,0 +1,45 @@
+# This file was copied from the following URL and modified:
+# https://github.com/golangci/golangci-lint-action/blob/master/README.md#how-to-use
+
+name: golangci-lint
+on:
+  push:
+    tags:
+      - v*
+    branches:
+      - master
+      - main
+  pull_request:
+permissions:
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  # pull-requests: read
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
+          version: v1.43 # current version at time of commit
+
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+
+          # Optional: golangci-lint command line arguments.
+          # args: --issues-exit-code=0
+
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true
+
+          # Optional: if set to true then the action will use pre-installed Go.
+          # skip-go-installation: true
+
+          # Optional: if set to true then the action don't cache or restore ~/go/pkg.
+          # skip-pkg-cache: true
+
+          # Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
+          # skip-build-cache: true

cmd/go-ouroboros-network/main.go

@@ -136,7 +136,7 @@ func main() {
 		fmt.Printf("ERROR: unknown era '%s' specified as chain-sync start point\n", f.syncEra)
 		os.Exit(1)
 	}
-	syncState.readyForNextBlockChan = make(chan bool, 0)
+	syncState.readyForNextBlockChan = make(chan bool)
 	intersect := []interface{}{}
 	if len(eraIntersect[f.networkMagic][f.syncEra]) > 0 {
 		// Slot

muxer/muxer.go

@@ -36,7 +36,9 @@ func (m *Muxer) RegisterProtocol(protocolId uint16) (chan *Message, chan *Messag
 	go func() {
 		for {
 			msg := <-senderChan
-			m.Send(msg)
+			if err := m.Send(msg); err != nil {
+				m.ErrorChan <- err
+			}
 		}
 	}()
 	return senderChan, receiverChan

protocol/chainsync/messages.go

@@ -36,12 +36,6 @@ func newMsgFindIntersect(points []interface{}) *msgFindIntersect {
 	return m
 }
 
-type msgAwaitReply struct {
-	// Tells the CBOR decoder to convert to/from a struct and a CBOR array
-	_           struct{} `cbor:",toarray"`
-	MessageType uint8
-}
-
 type msgRollForward struct {
 	// Tells the CBOR decoder to convert to/from a struct and a CBOR array
 	_           struct{} `cbor:",toarray"`
@@ -80,12 +74,6 @@ type msgIntersectNotFound struct {
 	Tip         tip
 }
 
-type msgDone struct {
-	// Tells the CBOR decoder to convert to/from a struct and a CBOR array
-	_           struct{} `cbor:",toarray"`
-	MessageType uint8
-}
-
 type tip struct {
 	// Tells the CBOR decoder to convert to/from a struct and a CBOR array
 	_           struct{} `cbor:",toarray"`

utils/debug.go

@@ -55,7 +55,7 @@ func DumpCborStructure(data interface{}, prefix string) string {
 		// Add 2 more spaces to the new prefix
 		newPrefix = fmt.Sprintf("  %s", newPrefix)
 		for key, val := range v {
-			ret.WriteString(fmt.Sprintf("%s%#v => %#v,\n", prefix, key, val))
+			ret.WriteString(fmt.Sprintf("%s%#v => %#v,\n", newPrefix, key, val))
 		}
 		ret.WriteString(fmt.Sprintf("%s}\n", prefix))
 	default: