diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2520fc39..29abecbb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,15 +14,15 @@ jobs: - name: Install Go uses: actions/setup-go@v5 with: - go-version: 1.21.7 + go-version: 1.21.8 - name: Prepare Env run: bash scripts/prepare_environ.sh - name: Test - working-directory: /home/runner/go/src/github.com/SmartBFT-Go/consensus + working-directory: /home/runner/go/src/github.com/hyperledger-labs/SmartBFT run: make all - name: Post - working-directory: /home/runner/go/src/github.com/SmartBFT-Go/consensus + working-directory: /home/runner/go/src/github.com/hyperledger-labs/SmartBFT run: ./scripts/post.sh diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 32c2afa0..7a29fd36 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ v2 ] + branches: [ main ] pull_request: # The branches below must be a subset of the branches above - branches: [ v2 ] + branches: [ main ] schedule: - cron: '29 1 * * 5' @@ -38,11 +38,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -53,7 +53,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -67,4 +67,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/README.md b/README.md index ae529deb..5157198f 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This is a Byzantine fault-tolerant (BFT) state machine replication (SMR) library. It is an open source library written in Go. The implementation is inspired by the [BFT-SMaRt project](https://github.com/bft-smart/library). -For more information on this library see our [wiki page](https://github.com/SmartBFT-Go/consensus/wiki). +For more information on this library see our [wiki page](https://github.com/hyperledger-labs/SmartBFT/wiki). ## License @@ -19,9 +19,3 @@ The source code files are made available under the Apache License, Version 2.0 ( * Hagar Meir - [hagar.meir@ibm.com](mailto:hagar.meir@ibm.com) * Artem Barger - [bartem@il.ibm.com](mailto:bartem@il.ibm.com) * Yoav Tock - [tock@il.ibm.com](mailto:tock@il.ibm.com) - -## Ownership - -The library development was sponsored by __[Idea](https://scientificideas.org/)__ - The Interdisciplinary Blockchain Research and Expertise center. - -* Gennadiy Muzykantov - [repository admin](mailto:g@muzykantov.me) \ No newline at end of file diff --git a/examples/naive_chain/chain.go b/examples/naive_chain/chain.go index 80f08d4f..112c2611 100644 --- a/examples/naive_chain/chain.go +++ b/examples/naive_chain/chain.go @@ -8,8 +8,8 @@ package naive import ( "encoding/asn1" - smart "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/wal" + smart "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/wal" ) type Block struct { diff --git a/examples/naive_chain/chain_test.go b/examples/naive_chain/chain_test.go index cac825b1..bdd73610 100644 --- a/examples/naive_chain/chain_test.go +++ b/examples/naive_chain/chain_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - smart "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/metrics/disabled" - "github.com/SmartBFT-Go/consensus/pkg/wal" "github.com/golang/protobuf/proto" + smart "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger-labs/SmartBFT/pkg/wal" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/examples/naive_chain/node.go b/examples/naive_chain/node.go index 64073fb3..571079a7 100644 --- a/examples/naive_chain/node.go +++ b/examples/naive_chain/node.go @@ -13,12 +13,12 @@ import ( "sync" "time" - smart "github.com/SmartBFT-Go/consensus/pkg/api" - smartbft "github.com/SmartBFT-Go/consensus/pkg/consensus" - bft "github.com/SmartBFT-Go/consensus/pkg/types" - "github.com/SmartBFT-Go/consensus/pkg/wal" - "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + smart "github.com/hyperledger-labs/SmartBFT/pkg/api" + smartbft "github.com/hyperledger-labs/SmartBFT/pkg/consensus" + bft "github.com/hyperledger-labs/SmartBFT/pkg/types" + "github.com/hyperledger-labs/SmartBFT/pkg/wal" + "github.com/hyperledger-labs/SmartBFT/smartbftprotos" ) type ( diff --git a/go.mod b/go.mod index 84cd4c5e..bceac9b8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/SmartBFT-Go/consensus +module github.com/hyperledger-labs/SmartBFT go 1.20 diff --git a/internal/bft/batcher_test.go b/internal/bft/batcher_test.go index 35267e84..dc01020f 100644 --- a/internal/bft/batcher_test.go +++ b/internal/bft/batcher_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/SmartBFT-Go/consensus/internal/bft" - "github.com/SmartBFT-Go/consensus/internal/bft/mocks" - "github.com/SmartBFT-Go/consensus/pkg/types" + "github.com/hyperledger-labs/SmartBFT/internal/bft" + "github.com/hyperledger-labs/SmartBFT/internal/bft/mocks" + "github.com/hyperledger-labs/SmartBFT/pkg/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "go.uber.org/zap" diff --git a/internal/bft/controller.go b/internal/bft/controller.go index 23e5bb41..19cb5e0b 100644 --- a/internal/bft/controller.go +++ b/internal/bft/controller.go @@ -10,10 +10,10 @@ import ( "sync/atomic" "time" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/types" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" ) // Decider delivers the proposal with signatures to the application diff --git a/internal/bft/controller_test.go b/internal/bft/controller_test.go index b28a865e..9bc0bd36 100644 --- a/internal/bft/controller_test.go +++ b/internal/bft/controller_test.go @@ -12,14 +12,14 @@ import ( "testing" "time" - "github.com/SmartBFT-Go/consensus/internal/bft" - "github.com/SmartBFT-Go/consensus/internal/bft/mocks" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/metrics/disabled" - "github.com/SmartBFT-Go/consensus/pkg/types" - "github.com/SmartBFT-Go/consensus/pkg/wal" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + "github.com/hyperledger-labs/SmartBFT/internal/bft" + "github.com/hyperledger-labs/SmartBFT/internal/bft/mocks" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + "github.com/hyperledger-labs/SmartBFT/pkg/wal" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/bft/hbm_test.go b/internal/bft/hbm_test.go index e4639cd8..8ca5bd89 100644 --- a/internal/bft/hbm_test.go +++ b/internal/bft/hbm_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/SmartBFT-Go/consensus/smartbftprotos" + "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/internal/bft/heartbeatmonitor.go b/internal/bft/heartbeatmonitor.go index 3fd87f8e..1d8e7d50 100644 --- a/internal/bft/heartbeatmonitor.go +++ b/internal/bft/heartbeatmonitor.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "time" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/smartbftprotos" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/smartbftprotos" ) // A node could either be a leader or a follower diff --git a/internal/bft/heartbeatmonitor_test.go b/internal/bft/heartbeatmonitor_test.go index bb8461ef..562102d4 100644 --- a/internal/bft/heartbeatmonitor_test.go +++ b/internal/bft/heartbeatmonitor_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "github.com/SmartBFT-Go/consensus/internal/bft" - "github.com/SmartBFT-Go/consensus/internal/bft/mocks" - "github.com/SmartBFT-Go/consensus/pkg/types" - "github.com/SmartBFT-Go/consensus/smartbftprotos" + "github.com/hyperledger-labs/SmartBFT/internal/bft" + "github.com/hyperledger-labs/SmartBFT/internal/bft/mocks" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "go.uber.org/zap" diff --git a/internal/bft/mocks/application_mock.go b/internal/bft/mocks/application_mock.go index 786a521a..e16506dd 100644 --- a/internal/bft/mocks/application_mock.go +++ b/internal/bft/mocks/application_mock.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/SmartBFT-Go/consensus/pkg/types" + types "github.com/hyperledger-labs/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/assembler_mock.go b/internal/bft/mocks/assembler_mock.go index cbed6d17..e08824bb 100644 --- a/internal/bft/mocks/assembler_mock.go +++ b/internal/bft/mocks/assembler_mock.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/SmartBFT-Go/consensus/pkg/types" + types "github.com/hyperledger-labs/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/comm_mock.go b/internal/bft/mocks/comm_mock.go index 72351125..cfbc98ef 100644 --- a/internal/bft/mocks/comm_mock.go +++ b/internal/bft/mocks/comm_mock.go @@ -3,7 +3,7 @@ package mocks import ( - smartbftprotos "github.com/SmartBFT-Go/consensus/smartbftprotos" + smartbftprotos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/decider.go b/internal/bft/mocks/decider.go index 1e60de81..eaa054fd 100644 --- a/internal/bft/mocks/decider.go +++ b/internal/bft/mocks/decider.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/SmartBFT-Go/consensus/pkg/types" + types "github.com/hyperledger-labs/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/leader_monitor.go b/internal/bft/mocks/leader_monitor.go index 121e2ca9..e3e791eb 100644 --- a/internal/bft/mocks/leader_monitor.go +++ b/internal/bft/mocks/leader_monitor.go @@ -3,10 +3,10 @@ package mocks import ( - bft "github.com/SmartBFT-Go/consensus/internal/bft" + bft "github.com/hyperledger-labs/SmartBFT/internal/bft" mock "github.com/stretchr/testify/mock" - smartbftprotos "github.com/SmartBFT-Go/consensus/smartbftprotos" + smartbftprotos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" ) // LeaderMonitor is an autogenerated mock type for the LeaderMonitor type diff --git a/internal/bft/mocks/proposer_builder.go b/internal/bft/mocks/proposer_builder.go index 8032e158..f84a6492 100644 --- a/internal/bft/mocks/proposer_builder.go +++ b/internal/bft/mocks/proposer_builder.go @@ -3,7 +3,7 @@ package mocks import ( - bft "github.com/SmartBFT-Go/consensus/internal/bft" + bft "github.com/hyperledger-labs/SmartBFT/internal/bft" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/request_pool.go b/internal/bft/mocks/request_pool.go index 71d6e8ce..392208cf 100644 --- a/internal/bft/mocks/request_pool.go +++ b/internal/bft/mocks/request_pool.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/SmartBFT-Go/consensus/pkg/types" + types "github.com/hyperledger-labs/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/request_timeout_handler.go b/internal/bft/mocks/request_timeout_handler.go index b064f276..09e06fd2 100644 --- a/internal/bft/mocks/request_timeout_handler.go +++ b/internal/bft/mocks/request_timeout_handler.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/SmartBFT-Go/consensus/pkg/types" + types "github.com/hyperledger-labs/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/requests_timer.go b/internal/bft/mocks/requests_timer.go index 28f254c9..e3265578 100644 --- a/internal/bft/mocks/requests_timer.go +++ b/internal/bft/mocks/requests_timer.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/SmartBFT-Go/consensus/pkg/types" + types "github.com/hyperledger-labs/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/signer_mock.go b/internal/bft/mocks/signer_mock.go index 02dff545..89ec830b 100644 --- a/internal/bft/mocks/signer_mock.go +++ b/internal/bft/mocks/signer_mock.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/SmartBFT-Go/consensus/pkg/types" + types "github.com/hyperledger-labs/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/state.go b/internal/bft/mocks/state.go index 51ff6e90..b17b40a5 100644 --- a/internal/bft/mocks/state.go +++ b/internal/bft/mocks/state.go @@ -3,10 +3,10 @@ package mocks import ( - bft "github.com/SmartBFT-Go/consensus/internal/bft" + bft "github.com/hyperledger-labs/SmartBFT/internal/bft" mock "github.com/stretchr/testify/mock" - smartbftprotos "github.com/SmartBFT-Go/consensus/smartbftprotos" + smartbftprotos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" ) // State is an autogenerated mock type for the State type diff --git a/internal/bft/mocks/synchronizer_mock.go b/internal/bft/mocks/synchronizer_mock.go index d78922aa..5ce25521 100644 --- a/internal/bft/mocks/synchronizer_mock.go +++ b/internal/bft/mocks/synchronizer_mock.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/SmartBFT-Go/consensus/pkg/types" + types "github.com/hyperledger-labs/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/mocks/verifier_mock.go b/internal/bft/mocks/verifier_mock.go index f08da4aa..44d1318a 100644 --- a/internal/bft/mocks/verifier_mock.go +++ b/internal/bft/mocks/verifier_mock.go @@ -3,7 +3,7 @@ package mocks import ( - types "github.com/SmartBFT-Go/consensus/pkg/types" + types "github.com/hyperledger-labs/SmartBFT/pkg/types" mock "github.com/stretchr/testify/mock" ) diff --git a/internal/bft/requestpool.go b/internal/bft/requestpool.go index 78870c45..477efa6c 100644 --- a/internal/bft/requestpool.go +++ b/internal/bft/requestpool.go @@ -12,9 +12,9 @@ import ( "sync" "time" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/metrics/disabled" - "github.com/SmartBFT-Go/consensus/pkg/types" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger-labs/SmartBFT/pkg/types" "github.com/pkg/errors" "golang.org/x/sync/semaphore" ) diff --git a/internal/bft/requestpool_test.go b/internal/bft/requestpool_test.go index 9847f35e..cf54fd10 100644 --- a/internal/bft/requestpool_test.go +++ b/internal/bft/requestpool_test.go @@ -14,9 +14,9 @@ import ( "testing" "time" - "github.com/SmartBFT-Go/consensus/internal/bft" - "github.com/SmartBFT-Go/consensus/internal/bft/mocks" - "github.com/SmartBFT-Go/consensus/pkg/types" + "github.com/hyperledger-labs/SmartBFT/internal/bft" + "github.com/hyperledger-labs/SmartBFT/internal/bft/mocks" + "github.com/hyperledger-labs/SmartBFT/pkg/types" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/bft/sched_test.go b/internal/bft/sched_test.go index 583df3ff..9ba0f659 100644 --- a/internal/bft/sched_test.go +++ b/internal/bft/sched_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/SmartBFT-Go/consensus/internal/bft" + "github.com/hyperledger-labs/SmartBFT/internal/bft" "github.com/stretchr/testify/assert" ) diff --git a/internal/bft/state.go b/internal/bft/state.go index f3cc21b0..e0dba836 100644 --- a/internal/bft/state.go +++ b/internal/bft/state.go @@ -8,10 +8,10 @@ package bft import ( "fmt" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/types" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/pkg/errors" ) diff --git a/internal/bft/state_test.go b/internal/bft/state_test.go index c6585dd5..7e69548a 100644 --- a/internal/bft/state_test.go +++ b/internal/bft/state_test.go @@ -8,11 +8,11 @@ package bft_test import ( "testing" - "github.com/SmartBFT-Go/consensus/internal/bft" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/metrics/disabled" - "github.com/SmartBFT-Go/consensus/pkg/types" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" + "github.com/hyperledger-labs/SmartBFT/internal/bft" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/internal/bft/statecollector.go b/internal/bft/statecollector.go index ce83d2a5..065c044e 100644 --- a/internal/bft/statecollector.go +++ b/internal/bft/statecollector.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/types" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" ) // StateCollector collects the current state from other nodes diff --git a/internal/bft/statecollector_test.go b/internal/bft/statecollector_test.go index 541ed2fd..2b8f0540 100644 --- a/internal/bft/statecollector_test.go +++ b/internal/bft/statecollector_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/SmartBFT-Go/consensus/internal/bft" - "github.com/SmartBFT-Go/consensus/pkg/types" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" + "github.com/hyperledger-labs/SmartBFT/internal/bft" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/internal/bft/support.go b/internal/bft/support.go index 618f29f7..7b19ffb7 100644 --- a/internal/bft/support.go +++ b/internal/bft/support.go @@ -6,8 +6,8 @@ package bft import ( - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/smartbftprotos" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/smartbftprotos" ) // Generate mocks for a collection of interfaces that are defined in api/dependencies.go diff --git a/internal/bft/util.go b/internal/bft/util.go index 53ffeaf8..eac5e8df 100644 --- a/internal/bft/util.go +++ b/internal/bft/util.go @@ -16,10 +16,10 @@ import ( "sync" "sync/atomic" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/types" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" ) type proposalInfo struct { diff --git a/internal/bft/util_test.go b/internal/bft/util_test.go index 509d42c1..7db1989b 100644 --- a/internal/bft/util_test.go +++ b/internal/bft/util_test.go @@ -9,10 +9,10 @@ import ( "fmt" "testing" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/metrics/disabled" - "github.com/SmartBFT-Go/consensus/pkg/types" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/internal/bft/view.go b/internal/bft/view.go index f543024c..161bfeb2 100644 --- a/internal/bft/view.go +++ b/internal/bft/view.go @@ -12,10 +12,10 @@ import ( "sync/atomic" "time" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/types" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/pkg/errors" ) diff --git a/internal/bft/view_test.go b/internal/bft/view_test.go index 09655793..d5cdaba1 100644 --- a/internal/bft/view_test.go +++ b/internal/bft/view_test.go @@ -14,14 +14,14 @@ import ( "sync/atomic" "testing" - "github.com/SmartBFT-Go/consensus/internal/bft" - "github.com/SmartBFT-Go/consensus/internal/bft/mocks" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/metrics/disabled" - "github.com/SmartBFT-Go/consensus/pkg/types" - "github.com/SmartBFT-Go/consensus/pkg/wal" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + "github.com/hyperledger-labs/SmartBFT/internal/bft" + "github.com/hyperledger-labs/SmartBFT/internal/bft/mocks" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + "github.com/hyperledger-labs/SmartBFT/pkg/wal" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "go.uber.org/zap" diff --git a/internal/bft/viewchanger.go b/internal/bft/viewchanger.go index 0d5353df..f835fee3 100644 --- a/internal/bft/viewchanger.go +++ b/internal/bft/viewchanger.go @@ -11,11 +11,11 @@ import ( "sync/atomic" "time" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/metrics/disabled" - "github.com/SmartBFT-Go/consensus/pkg/types" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/pkg/errors" ) diff --git a/internal/bft/viewchanger_test.go b/internal/bft/viewchanger_test.go index b6daa9c3..2a252f47 100644 --- a/internal/bft/viewchanger_test.go +++ b/internal/bft/viewchanger_test.go @@ -12,13 +12,13 @@ import ( "testing" "time" - "github.com/SmartBFT-Go/consensus/internal/bft" - "github.com/SmartBFT-Go/consensus/internal/bft/mocks" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/metrics/disabled" - "github.com/SmartBFT-Go/consensus/pkg/types" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + "github.com/hyperledger-labs/SmartBFT/internal/bft" + "github.com/hyperledger-labs/SmartBFT/internal/bft/mocks" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/pkg/api/dependencies.go b/pkg/api/dependencies.go index 12cc9a3f..5649a82d 100644 --- a/pkg/api/dependencies.go +++ b/pkg/api/dependencies.go @@ -6,8 +6,8 @@ package api import ( - bft "github.com/SmartBFT-Go/consensus/pkg/types" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" + bft "github.com/hyperledger-labs/SmartBFT/pkg/types" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" ) // Application delivers the consented proposal and corresponding signatures. diff --git a/pkg/api/metrics.go b/pkg/api/metrics.go index 7b7585b0..1e0eb99c 100644 --- a/pkg/api/metrics.go +++ b/pkg/api/metrics.go @@ -5,7 +5,7 @@ import ( "sort" "strconv" - "github.com/SmartBFT-Go/consensus/pkg/metrics" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics" ) const ( diff --git a/pkg/api/metrics_test.go b/pkg/api/metrics_test.go index 88d2f000..216ad52d 100644 --- a/pkg/api/metrics_test.go +++ b/pkg/api/metrics_test.go @@ -3,8 +3,8 @@ package api_test import ( "testing" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/metrics" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics" "github.com/stretchr/testify/assert" ) diff --git a/pkg/consensus/consensus.go b/pkg/consensus/consensus.go index aac5346e..5f5345c4 100644 --- a/pkg/consensus/consensus.go +++ b/pkg/consensus/consensus.go @@ -12,12 +12,12 @@ import ( "sync/atomic" "time" - algorithm "github.com/SmartBFT-Go/consensus/internal/bft" - bft "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/metrics/disabled" - "github.com/SmartBFT-Go/consensus/pkg/types" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + algorithm "github.com/hyperledger-labs/SmartBFT/internal/bft" + bft "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/pkg/errors" ) diff --git a/pkg/metrics/disabled/provider.go b/pkg/metrics/disabled/provider.go index 457db1f1..b9fe1a62 100644 --- a/pkg/metrics/disabled/provider.go +++ b/pkg/metrics/disabled/provider.go @@ -7,7 +7,7 @@ SPDX-License-Identifier: Apache-2.0 package disabled import ( - bft "github.com/SmartBFT-Go/consensus/pkg/metrics" + bft "github.com/hyperledger-labs/SmartBFT/pkg/metrics" ) type Provider struct{} diff --git a/pkg/types/types.go b/pkg/types/types.go index 83851bc0..5c65bcc3 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -12,7 +12,7 @@ import ( "fmt" "sync" - "github.com/SmartBFT-Go/consensus/smartbftprotos" + "github.com/hyperledger-labs/SmartBFT/smartbftprotos" ) type Proposal struct { diff --git a/pkg/wal/metrics.go b/pkg/wal/metrics.go index e6d8ca75..3aedea71 100644 --- a/pkg/wal/metrics.go +++ b/pkg/wal/metrics.go @@ -1,8 +1,8 @@ package wal import ( - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/metrics" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics" ) var countOfFilesOpts = metrics.GaugeOpts{ diff --git a/pkg/wal/reader.go b/pkg/wal/reader.go index d98ecc52..b2294f08 100644 --- a/pkg/wal/reader.go +++ b/pkg/wal/reader.go @@ -13,9 +13,9 @@ import ( "io" "os" - "github.com/SmartBFT-Go/consensus/pkg/api" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" ) type LogRecordReader struct { diff --git a/pkg/wal/reader_test.go b/pkg/wal/reader_test.go index effbc93b..e8eceb21 100644 --- a/pkg/wal/reader_test.go +++ b/pkg/wal/reader_test.go @@ -12,8 +12,8 @@ import ( "path/filepath" "testing" - "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/pkg/wal/util.go b/pkg/wal/util.go index 582cdce0..040f3ea2 100644 --- a/pkg/wal/util.go +++ b/pkg/wal/util.go @@ -14,7 +14,7 @@ import ( "sort" "strings" - "github.com/SmartBFT-Go/consensus/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/api" ) var padTable [][]byte diff --git a/pkg/wal/util_test.go b/pkg/wal/util_test.go index 841fbadd..df2cda38 100644 --- a/pkg/wal/util_test.go +++ b/pkg/wal/util_test.go @@ -12,8 +12,8 @@ import ( "path/filepath" "testing" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/smartbftprotos" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/pkg/wal/writeaheadlog.go b/pkg/wal/writeaheadlog.go index 06633cdb..4c4cdc50 100644 --- a/pkg/wal/writeaheadlog.go +++ b/pkg/wal/writeaheadlog.go @@ -15,10 +15,10 @@ import ( "strings" "sync" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/metrics/disabled" - protos "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" + protos "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/pkg/errors" ) diff --git a/pkg/wal/writeaheadlog_test.go b/pkg/wal/writeaheadlog_test.go index cfcfd395..d77cd002 100644 --- a/pkg/wal/writeaheadlog_test.go +++ b/pkg/wal/writeaheadlog_test.go @@ -13,8 +13,8 @@ import ( "path/filepath" "testing" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/smartbftprotos" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/scripts/post.sh b/scripts/post.sh index 17e42b31..ba22d121 100755 --- a/scripts/post.sh +++ b/scripts/post.sh @@ -2,4 +2,4 @@ export GOPATH=$(go env GOPATH) cd .. -mv consensus /home/runner/work/consensus/ +mv SmartBFT /home/runner/work/SmartBFT/ diff --git a/scripts/prepare_environ.sh b/scripts/prepare_environ.sh index c2771a73..58f0f35b 100755 --- a/scripts/prepare_environ.sh +++ b/scripts/prepare_environ.sh @@ -3,8 +3,8 @@ export GOROOT=$(go env GOROOT) export GOPATH=$(go env GOPATH) -mkdir -p $GOPATH/src/github.com/SmartBFT-Go/ +mkdir -p $GOPATH/src/github.com/hyperledger-labs/ cd .. echo "[[[[" `pwd` "]]]]" -mv consensus $GOPATH/src/github.com/SmartBFT-Go/ -cd $GOPATH/src/github.com/SmartBFT-Go/consensus +mv SmartBFT $GOPATH/src/github.com/hyperledger-labs/ +cd $GOPATH/src/github.com/hyperledger-labs/SmartBFT diff --git a/smartbftprotos/logrecord.proto b/smartbftprotos/logrecord.proto index f3b9ca6f..cde62529 100644 --- a/smartbftprotos/logrecord.proto +++ b/smartbftprotos/logrecord.proto @@ -5,7 +5,7 @@ syntax = "proto3"; -option go_package = "github.com/SmartBFT-Go/consensus/smartbftprotos"; +option go_package = "github.com/hyperledger-labs/SmartBFT/smartbftprotos"; package smartbftprotos; diff --git a/smartbftprotos/messages.proto b/smartbftprotos/messages.proto index 4e6c754d..70da3558 100644 --- a/smartbftprotos/messages.proto +++ b/smartbftprotos/messages.proto @@ -6,7 +6,7 @@ syntax = "proto3"; -option go_package = "github.com/SmartBFT-Go/consensus/smartbftprotos"; +option go_package = "github.com/hyperledger-labs/SmartBFT/smartbftprotos"; package smartbftprotos; diff --git a/test/basic_test.go b/test/basic_test.go index 04484384..392afa4d 100644 --- a/test/basic_test.go +++ b/test/basic_test.go @@ -17,9 +17,9 @@ import ( "testing" "time" - "github.com/SmartBFT-Go/consensus/internal/bft" - "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + "github.com/hyperledger-labs/SmartBFT/internal/bft" + "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "github.com/stretchr/testify/assert" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/test/network.go b/test/network.go index 8d3e9723..91075716 100644 --- a/test/network.go +++ b/test/network.go @@ -11,8 +11,8 @@ import ( "sort" "sync" - "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + "github.com/hyperledger-labs/SmartBFT/smartbftprotos" ) const ( diff --git a/test/network_test.go b/test/network_test.go index fd594190..ffc62dff 100644 --- a/test/network_test.go +++ b/test/network_test.go @@ -8,7 +8,7 @@ package test import ( "testing" - "github.com/SmartBFT-Go/consensus/smartbftprotos" + "github.com/hyperledger-labs/SmartBFT/smartbftprotos" ) func TestNetwork(*testing.T) { diff --git a/test/reconfig.go b/test/reconfig.go index 0e8ee104..aea7ee74 100644 --- a/test/reconfig.go +++ b/test/reconfig.go @@ -3,7 +3,7 @@ package test import ( "time" - "github.com/SmartBFT-Go/consensus/pkg/types" + "github.com/hyperledger-labs/SmartBFT/pkg/types" ) type Configuration struct { diff --git a/test/reconfig_test.go b/test/reconfig_test.go index 0e6e29ad..c86bdde0 100644 --- a/test/reconfig_test.go +++ b/test/reconfig_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/SmartBFT-Go/consensus/pkg/types" + "github.com/hyperledger-labs/SmartBFT/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/test/test_app.go b/test/test_app.go index 707ba940..8f75f5e6 100644 --- a/test/test_app.go +++ b/test/test_app.go @@ -13,14 +13,14 @@ import ( "sync/atomic" "time" - "github.com/SmartBFT-Go/consensus/pkg/api" - "github.com/SmartBFT-Go/consensus/pkg/consensus" - "github.com/SmartBFT-Go/consensus/pkg/metrics" - "github.com/SmartBFT-Go/consensus/pkg/metrics/disabled" - "github.com/SmartBFT-Go/consensus/pkg/types" - "github.com/SmartBFT-Go/consensus/pkg/wal" - "github.com/SmartBFT-Go/consensus/smartbftprotos" "github.com/golang/protobuf/proto" + "github.com/hyperledger-labs/SmartBFT/pkg/api" + "github.com/hyperledger-labs/SmartBFT/pkg/consensus" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics" + "github.com/hyperledger-labs/SmartBFT/pkg/metrics/disabled" + "github.com/hyperledger-labs/SmartBFT/pkg/types" + "github.com/hyperledger-labs/SmartBFT/pkg/wal" + "github.com/hyperledger-labs/SmartBFT/smartbftprotos" "go.uber.org/zap" "go.uber.org/zap/zapcore" )