merge: final-touch-pr into main

openthread · Sep 19, 2022 · c3a61f8 · c3a61f8
2 parents 31e9e06 + ae7a872
commit c3a61f8
Show file tree

Hide file tree

Showing 44 changed files with 275 additions and 177 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,9 +27,6 @@
 name: Build
 
 on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
   pull_request:
     branches:
       - 'main'
@@ -49,15 +46,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - go: 1.13
-            os: ubuntu-20.04
-          - go: 1.14
-            os: ubuntu-20.04
-          - go: 1.15
-            os: ubuntu-20.04
-          - go: 1.13
-            os: macos-10.15
+        go: [ 1.17, 1.18 ]
+        os: [ ubuntu-20.04, macos-11 ]
     steps:
       - uses: actions/setup-go@v1
         with:

diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -27,9 +27,6 @@
 name: Develop
 
 on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
   pull_request:
     branches:
       - 'main'
@@ -44,16 +41,16 @@ jobs:
         if: "github.ref != 'refs/heads/main'"
 
   develop:
-    name: Develop (Go${{ matrix.go }},Py${{matrix.python-version}},${{ matrix.os }})
+    name: Develop (Go${{ matrix.go }},${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     env:
       HOMEBREW_NO_AUTO_UPDATE: 1
     strategy:
       fail-fast: false
       matrix:
-        go: [1.13, 1.15]
-        python-version: [3.6, 3.8]
-        os: [ubuntu-20.04, macos-10.15]
+        go: [1.17, 1.18]
+        python-version: [3.7]
+        os: [ubuntu-20.04]
     steps:
       - uses: actions/setup-go@v1
         with:
@@ -64,6 +61,6 @@ jobs:
       - uses: actions/checkout@v2
       - name: Build
         run: |
-          ./script/setup-dev
-          ./script/pack-web
-          go get ./cmd/otns
+          docker build -t otns-env -f etc/docker/environment/Dockerfile .
+          docker run -t -v$PWD:/otns otns-env -c "./script/pack-web"
+          git diff --quiet
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -27,9 +27,6 @@
 name: Docker
 
 on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
   pull_request:
     branches:
       - 'main'
@@ -43,9 +40,15 @@ jobs:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         if: "github.ref != 'refs/heads/main'"
 
-  buildx-playground:
-    name: buildx-playground
+  buildx:
+    name: buildx-${{ matrix.version }}
     runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - "environment"
+          - "playground"
     steps:
       - uses: actions/checkout@v2
       - name: Set up Docker Buildx
@@ -54,9 +57,9 @@ jobs:
         id: prepare
         run: |
           DOCKER_IMAGE=openthread/otns
-          DOCKER_FILE=etc/docker/playground/Dockerfile
+          DOCKER_FILE=etc/docker/${{ matrix.version }}/Dockerfile
           DOCKER_PLATFORMS=linux/amd64
-          VERSION=playground
+          VERSION=${{ matrix.version }}
 
           TAGS="--tag ${DOCKER_IMAGE}:${VERSION}"
 

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -27,9 +27,6 @@
 name: Lint
 
 on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
   pull_request:
     branches:
       - 'main'
@@ -51,7 +48,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v1
         with:
-          go-version: 1.14
+          go-version: 1.18
       - uses: actions/checkout@v2
       - name: Check pretty
         run: |

diff --git a/.github/workflows/stress.yml b/.github/workflows/stress.yml
@@ -27,9 +27,6 @@
 name: Stress
 
 on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
   pull_request:
     branches:
       - 'main'
@@ -48,18 +45,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
-        go-version: [1.14]
+        python-version: [3.7]
+        go-version: [1.18]
         suite: ["network-forming", "commissioning", "connectivity", "network-latency", "multicast-performance", "otns-performance", "network-limits"]
     runs-on: ubuntu-20.04
     env:
       HOMEBREW_NO_AUTO_UPDATE: 1
-      VIRTUAL_TIME_UART: 1
     steps:
       - uses: actions/setup-go@v1
         with:
           go-version: ${{ matrix.go-version }}
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up Python
         uses: actions/setup-python@v1
         with:
           python-version: ${{ matrix.python-version }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,9 +27,6 @@
 name: Test
 
 on:
-  push:
-    branches-ignore:
-      - 'dependabot/**'
   pull_request:
     branches:
       - 'main'
@@ -49,14 +46,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macos-10.15]
+        os: [ubuntu-20.04, macos-11]
     env:
-      VIRTUAL_TIME_UART: 1
       HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
       - uses: actions/setup-go@v1
         with:
-          go-version: 1.13
+          go-version: 1.18
       - uses: actions/checkout@v2
       - name: Test
         run: |
@@ -65,22 +61,20 @@ jobs:
         uses: codecov/codecov-action@v1
 
   py-unittests:
-    name: Unittests (Py${{ matrix.python-version }}, ${{ matrix.os }}, VIRTUAL_TIME_UART=${{ matrix.VIRTUAL_TIME_UART }})
+    name: Unittests (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6]
-        os: [ubuntu-20.04, macos-10.15]
-        VIRTUAL_TIME_UART: [0, 1]
+        python-version: [3.7]
+        os: [ubuntu-20.04, macos-11]
     env:
-      VIRTUAL_TIME_UART: ${{ matrix.VIRTUAL_TIME_UART }}
       HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
       - uses: actions/setup-go@v1
         with:
-          go-version: 1.13
-      - name: Set up Python ${{ matrix.python-version }}
+          go-version: 1.18
+      - name: Set up Python
         uses: actions/setup-python@v1
         with:
           python-version: ${{ matrix.python-version }}
@@ -90,22 +84,20 @@ jobs:
           ./script/test py-unittests
 
   py-examples:
-    name: Examples (Py${{ matrix.python-version }}, ${{ matrix.os }}, VIRTUAL_TIME_UART=${{ matrix.VIRTUAL_TIME_UART }})
+    name: Examples (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6]
-        os: [ubuntu-20.04, macos-10.15]
-        VIRTUAL_TIME_UART: [0, 1]
+        python-version: [3.7]
+        os: [ubuntu-20.04, macos-11]
     env:
-      VIRTUAL_TIME_UART: ${{ matrix.VIRTUAL_TIME_UART }}
       HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
       - uses: actions/setup-go@v1
         with:
-          go-version: 1.13
-      - name: Set up Python ${{ matrix.python-version }}
+          go-version: 1.18
+      - name: Set up Python
         uses: actions/setup-python@v1
         with:
           python-version: ${{ matrix.python-version }}
@@ -115,21 +107,19 @@ jobs:
           ./script/test py-examples
 
   signals:
-    name: Signals (Py${{ matrix.python-version }}, ${{ matrix.os }}, VIRTUAL_TIME_UART=${{ matrix.VIRTUAL_TIME_UART }})
+    name: Signals (${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6]
-        os: [ubuntu-20.04, macos-10.15]
-        VIRTUAL_TIME_UART: [0, 1]
+        python-version: [3.7]
+        os: [ubuntu-20.04, macos-11]
     env:
-      VIRTUAL_TIME_UART: ${{ matrix.VIRTUAL_TIME_UART }}
       HOMEBREW_NO_AUTO_UPDATE: 1
     steps:
       - uses: actions/setup-go@v1
         with:
-          go-version: 1.13
+          go-version: 1.18
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:

diff --git a/GUIDE.md b/GUIDE.md
@@ -2,7 +2,7 @@
 
 ## Install Go
 
-OTNS requires [Go 1.13+](https://golang.org/dl/) to build:
+OTNS requires [Go 1.17+](https://golang.org/dl/) to build:
 
  - Install Go from https://golang.org/dl/
  - Add `$(go env GOPATH)/bin` (normally `$HOME/go/bin`) to `$PATH`.

diff --git a/cli/CmdRunner.go b/cli/CmdRunner.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The OTNS Authors.
+// Copyright (c) 2022, The OTNS Authors.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without

diff --git a/cli/ast.go b/cli/ast.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The OTNS Authors.
+// Copyright (c) 2022, The OTNS Authors.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without

diff --git a/cmd/otns-replay/grpc_service.go b/cmd/otns-replay/grpc_service.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The OTNS Authors.
+// Copyright (c) 2022, The OTNS Authors.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without

diff --git a/cmd/otns-replay/otns_replay.go b/cmd/otns-replay/otns_replay.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The OTNS Authors.
+// Copyright (c) 2022, The OTNS Authors.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without

diff --git a/dispatcher/Node.go b/dispatcher/Node.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2020, The OTNS Authors.
+// Copyright (c) 2022, The OTNS Authors.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -79,8 +79,8 @@ type Node struct {
 	RadioState         RadioStates
 	RadioChannel       uint8
 	radioLockState     bool
-	isInvalidReception []bool
 	rxBusyUntil        []uint64
+	isInvalidReception []bool
 	isWaitingAck       bool
 	waitAckSN          uint8
 
@@ -113,7 +113,7 @@ func newNode(d *Dispatcher, nodeid NodeId, x, y int, radioRange int) *Node {
 		joinerState:        OtJoinerStateIdle,
 		RadioChannel:       minChannel,
 		radioLockState:     false,
-		isInvalidReception: make([]bool, maxChannel-minChannel+1), // 1 for each channel (11-26)
+		isInvalidReception: make([]bool, maxChannel-minChannel+1), // one for each channel (11-26)
 		rxBusyUntil:        make([]uint64, maxChannel-minChannel+1),
 		isWaitingAck:       false,
 	}
@@ -130,11 +130,7 @@ func (node *Node) String() string {
 func (node *Node) Send(elapsed uint64, data []byte) {
 	msg := make([]byte, len(data)+11)
 	binary.LittleEndian.PutUint64(msg[:8], elapsed)
-	if node.D.IsCollisionAware {
-		msg[8] = eventTypeRadioComm
-	} else {
-		msg[8] = eventTypeRadioReceived
-	}
+	msg[8] = eventTypeRadioComm
 
 	binary.LittleEndian.PutUint16(msg[9:11], uint16(len(data)))
 	n := copy(msg[11:], data)