Skip to content

Add support for ConsensusTypeBFT in the orderer.go #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Add support for ConsensusTypeBFT in the orderer.go #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4e85206
Add support for ConsensusTypeBFT in the orderer.go
dviejokfs Oct 11, 2023
e61bb40
fix lint errors
dviejokfs Oct 11, 2023
3f92a9f
Add support for ConsensusTypeBFT in the orderer.go
dviejokfs Oct 11, 2023
023c0b6
fix lint errors
dviejokfs Oct 11, 2023
a7e02f7
Unmarshall metadata
dviejokfs Jan 18, 2024
d0ca879
Fix orderer tests
dviejokfs Jan 18, 2024
b397f03
SmartBFT -> SmartBFTOptions
dviejokfs Jan 18, 2024
ef1a156
Revert SmartBFTOptions -> SmartBFT to be consistent with Fabric
dviejokfs Jan 18, 2024
a044dae
Merge branch 'main' of https://github.com/kfsoftware/fabric-config
dviejokfs Aug 19, 2024
a0b16ca
Add SetConsenterMapping
dviejokfs Aug 19, 2024
9507b45
Update Go module dependencies and refactor proto imports
dviejokfs Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions configtx/application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"errors"
"fmt"

"github.com/golang/protobuf/proto"
cb "github.com/hyperledger/fabric-protos-go/common"
pb "github.com/hyperledger/fabric-protos-go/peer"
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
"google.golang.org/protobuf/proto"
)

// Application is a copy of the orderer configuration with the addition of an anchor peers
Expand Down
4 changes: 2 additions & 2 deletions configtx/application_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ import (
"math/big"
"testing"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-config/configtx/internal/policydsl"
"github.com/hyperledger/fabric-config/protolator"
"github.com/hyperledger/fabric-config/protolator/protoext/peerext"
cb "github.com/hyperledger/fabric-protos-go/common"
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
. "github.com/onsi/gomega"
"google.golang.org/protobuf/proto"
)

func TestNewApplicationGroup(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions configtx/capabilities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"errors"
"fmt"

"github.com/golang/protobuf/proto"
cb "github.com/hyperledger/fabric-protos-go/common"
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
"google.golang.org/protobuf/proto"
)

// capabilitiesValue returns the config definition for a set of capabilities.
Expand Down
2 changes: 1 addition & 1 deletion configtx/channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"errors"
"fmt"

cb "github.com/hyperledger/fabric-protos-go/common"
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
)

// ChannelGroup encapsulates the parts of the config that control channels.
Expand Down
2 changes: 1 addition & 1 deletion configtx/channel_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/hyperledger/fabric-config/protolator"
"github.com/hyperledger/fabric-config/protolator/protoext/commonext"
cb "github.com/hyperledger/fabric-protos-go/common"
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
. "github.com/onsi/gomega"
)

Expand Down
6 changes: 3 additions & 3 deletions configtx/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ import (
"strconv"
"strings"

"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"github.com/golang/protobuf/ptypes/timestamp"
cb "github.com/hyperledger/fabric-protos-go/common"
mb "github.com/hyperledger/fabric-protos-go/msp"
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
"google.golang.org/protobuf/proto"
)

// Channel is a channel configuration.
Expand Down
6 changes: 3 additions & 3 deletions configtx/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"fmt"
"testing"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-config/protolator"
cb "github.com/hyperledger/fabric-protos-go/common"
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
. "github.com/onsi/gomega"
"google.golang.org/protobuf/proto"
)

func TestNewConfigTx(t *testing.T) {
Expand Down Expand Up @@ -251,7 +251,7 @@ func TestNewCreateChannelTx(t *testing.T) {
err = proto.Unmarshal(actualData.ConfigUpdate, &actualConfigUpdate)
gt.Expect(err).NotTo(HaveOccurred())

gt.Expect(actualConfigUpdate).To(Equal(expectedConfigUpdate))
gt.Expect(&actualConfigUpdate).To(Equal(&expectedConfigUpdate))

// setting timestamps to match in ConfigUpdate
actualTimestamp := actualHeader.Timestamp
Expand Down
6 changes: 3 additions & 3 deletions configtx/consortiums.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"errors"
"fmt"

"github.com/golang/protobuf/proto"
cb "github.com/hyperledger/fabric-protos-go/common"
mb "github.com/hyperledger/fabric-protos-go/msp"
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
"google.golang.org/protobuf/proto"
)

// Consortium is a group of non-orderer organizations used in channel transactions.
Expand Down
4 changes: 2 additions & 2 deletions configtx/consortiums_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import (
"math/big"
"testing"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-config/protolator"
"github.com/hyperledger/fabric-config/protolator/protoext/commonext"
cb "github.com/hyperledger/fabric-protos-go/common"
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
. "github.com/onsi/gomega"
"google.golang.org/protobuf/proto"
)

func TestNewConsortiumsGroup(t *testing.T) {
Expand Down
3 changes: 3 additions & 0 deletions configtx/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ const (
// OrdererGroupKey is the group name for the orderer config.
OrdererGroupKey = "Orderer"

// OrderersGroupKey is the group name for the orderer config.
OrderersGroupKey = "Orderers"

// ApplicationGroupKey is the group name for the Application config.
ApplicationGroupKey = "Application"

Expand Down
10 changes: 5 additions & 5 deletions configtx/example_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ import (
"testing"
"time"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-config/configtx"
"github.com/hyperledger/fabric-config/configtx/membership"
"github.com/hyperledger/fabric-config/configtx/orderer"
cb "github.com/hyperledger/fabric-protos-go/common"
mb "github.com/hyperledger/fabric-protos-go/msp"
ob "github.com/hyperledger/fabric-protos-go/orderer"
pb "github.com/hyperledger/fabric-protos-go/peer"
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
ob "github.com/hyperledger/fabric-protos-go-apiv2/orderer"
pb "github.com/hyperledger/fabric-protos-go-apiv2/peer"
. "github.com/onsi/gomega"
"google.golang.org/protobuf/proto"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions configtx/internal/policydsl/policyparser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"strings"

"github.com/Knetic/govaluate"
"github.com/golang/protobuf/proto"
cb "github.com/hyperledger/fabric-protos-go/common"
mb "github.com/hyperledger/fabric-protos-go/msp"
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
"google.golang.org/protobuf/proto"
)

// Gate values
Expand Down
6 changes: 3 additions & 3 deletions configtx/internal/policydsl/policyparser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ package policydsl_test
import (
"testing"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-config/configtx/internal/policydsl"
cb "github.com/hyperledger/fabric-protos-go/common"
mb "github.com/hyperledger/fabric-protos-go/msp"
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
"google.golang.org/protobuf/proto"

. "github.com/onsi/gomega"
)
Expand Down
6 changes: 3 additions & 3 deletions configtx/msp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (
"reflect"
"time"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-config/configtx/membership"
cb "github.com/hyperledger/fabric-protos-go/common"
mb "github.com/hyperledger/fabric-protos-go/msp"
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
"google.golang.org/protobuf/proto"
)

// MSP is the configuration information for a Fabric MSP.
Expand Down
6 changes: 3 additions & 3 deletions configtx/msp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import (
"testing"
"time"

"github.com/golang/protobuf/proto"
"github.com/hyperledger/fabric-config/configtx/membership"
"github.com/hyperledger/fabric-config/configtx/orderer"
"github.com/hyperledger/fabric-config/protolator"
cb "github.com/hyperledger/fabric-protos-go/common"
mb "github.com/hyperledger/fabric-protos-go/msp"
cb "github.com/hyperledger/fabric-protos-go-apiv2/common"
mb "github.com/hyperledger/fabric-protos-go-apiv2/msp"
. "github.com/onsi/gomega"
"google.golang.org/protobuf/proto"
)

func TestMSPConfigurationFailures(t *testing.T) {
Expand Down
Loading