Skip to content

Commit 45da258

Browse files
author
Jason Yellick
committed
[FAB-5263] Reorganize orderer dir
The orderer directory has been overdue for being organized for some time now. With the change series of FAB-5258 there is a significant amount of code being rearranged already, so it makes sense to organize the directory at the same time, as the imports etc. will already be changing. The new structure is very simple: fabric/orderer - Contains the startup/main code fabric/orderer/consensus - Contains the individual consensus plugins for the orderer - ie Kafka/Solo, and eventually SBFT fabric/orderer/common - Contains the common code which feeds transactions to the consensus plugin, and satisfies the orderer atomicbroadcast API definition Change-Id: I112044dd5ade212378dab6c176265b76eb68ca80 Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
1 parent 30e20a7 commit 45da258

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+386
-438
lines changed

‎orderer/common/deliver/deliver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121

2222
"github.com/hyperledger/fabric/common/policies"
2323
"github.com/hyperledger/fabric/orderer/common/filter"
24+
"github.com/hyperledger/fabric/orderer/common/ledger"
2425
"github.com/hyperledger/fabric/orderer/common/sigfilter"
25-
"github.com/hyperledger/fabric/orderer/ledger"
2626
cb "github.com/hyperledger/fabric/protos/common"
2727
ab "github.com/hyperledger/fabric/protos/orderer"
2828
"github.com/op/go-logging"

‎orderer/common/deliver/deliver_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2626
mockpolicies "github.com/hyperledger/fabric/common/mocks/policies"
2727
"github.com/hyperledger/fabric/common/policies"
28-
"github.com/hyperledger/fabric/orderer/ledger"
29-
ramledger "github.com/hyperledger/fabric/orderer/ledger/ram"
28+
"github.com/hyperledger/fabric/orderer/common/ledger"
29+
ramledger "github.com/hyperledger/fabric/orderer/common/ledger/ram"
3030
cb "github.com/hyperledger/fabric/protos/common"
3131
ab "github.com/hyperledger/fabric/protos/orderer"
3232
"github.com/hyperledger/fabric/protos/utils"

‎orderer/ledger/blackbox_test.go ‎orderer/common/ledger/blackbox_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"reflect"
2222
"testing"
2323

24-
. "github.com/hyperledger/fabric/orderer/ledger"
24+
. "github.com/hyperledger/fabric/orderer/common/ledger"
2525
cb "github.com/hyperledger/fabric/protos/common"
2626
ab "github.com/hyperledger/fabric/protos/orderer"
2727
)

‎orderer/ledger/file/factory.go ‎orderer/common/ledger/file/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/hyperledger/fabric/common/ledger/blkstorage"
2323
"github.com/hyperledger/fabric/common/ledger/blkstorage/fsblkstorage"
24-
"github.com/hyperledger/fabric/orderer/ledger"
24+
"github.com/hyperledger/fabric/orderer/common/ledger"
2525
)
2626

2727
type fileLedgerFactory struct {

‎orderer/ledger/file/factory_test.go ‎orderer/common/ledger/file/factory_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2525
"github.com/hyperledger/fabric/common/ledger/blkstorage"
26-
"github.com/hyperledger/fabric/orderer/ledger"
26+
"github.com/hyperledger/fabric/orderer/common/ledger"
2727
"github.com/stretchr/testify/assert"
2828
)
2929

‎orderer/ledger/file/impl.go ‎orderer/common/ledger/file/impl.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package fileledger
1919
import (
2020
cl "github.com/hyperledger/fabric/common/ledger"
2121
"github.com/hyperledger/fabric/common/ledger/blkstorage"
22-
ledger "github.com/hyperledger/fabric/orderer/ledger"
22+
ledger "github.com/hyperledger/fabric/orderer/common/ledger"
2323
cb "github.com/hyperledger/fabric/protos/common"
2424
ab "github.com/hyperledger/fabric/protos/orderer"
2525
"github.com/op/go-logging"

‎orderer/ledger/file/impl_test.go ‎orderer/common/ledger/file/impl_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
2727
cl "github.com/hyperledger/fabric/common/ledger"
28-
"github.com/hyperledger/fabric/orderer/ledger"
28+
"github.com/hyperledger/fabric/orderer/common/ledger"
2929
cb "github.com/hyperledger/fabric/protos/common"
3030
ab "github.com/hyperledger/fabric/protos/orderer"
3131
"github.com/hyperledger/fabric/protos/peer"

‎orderer/ledger/file_test.go ‎orderer/common/ledger/file_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"os"
2222

2323
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
24-
. "github.com/hyperledger/fabric/orderer/ledger"
25-
fileledger "github.com/hyperledger/fabric/orderer/ledger/file"
24+
. "github.com/hyperledger/fabric/orderer/common/ledger"
25+
fileledger "github.com/hyperledger/fabric/orderer/common/ledger/file"
2626
)
2727

2828
func init() {

‎orderer/ledger/json/factory.go ‎orderer/common/ledger/json/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"sync"
2525

2626
"github.com/golang/protobuf/jsonpb"
27-
"github.com/hyperledger/fabric/orderer/ledger"
27+
"github.com/hyperledger/fabric/orderer/common/ledger"
2828
)
2929

3030
type jsonLedgerFactory struct {

‎orderer/ledger/json/factory_test.go ‎orderer/common/ledger/json/factory_test.go

File renamed without changes.

‎orderer/ledger/json/impl.go ‎orderer/common/ledger/json/impl.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"path/filepath"
2424
"sync"
2525

26-
ledger "github.com/hyperledger/fabric/orderer/ledger"
26+
ledger "github.com/hyperledger/fabric/orderer/common/ledger"
2727
cb "github.com/hyperledger/fabric/protos/common"
2828
ab "github.com/hyperledger/fabric/protos/orderer"
2929
"github.com/op/go-logging"

‎orderer/ledger/json/impl_test.go ‎orderer/common/ledger/json/impl_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"time"
2424

2525
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
26-
"github.com/hyperledger/fabric/orderer/ledger"
26+
"github.com/hyperledger/fabric/orderer/common/ledger"
2727
cb "github.com/hyperledger/fabric/protos/common"
2828
ab "github.com/hyperledger/fabric/protos/orderer"
2929

‎orderer/ledger/json_test.go ‎orderer/common/ledger/json_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"os"
2222

2323
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
24-
. "github.com/hyperledger/fabric/orderer/ledger"
25-
jsonledger "github.com/hyperledger/fabric/orderer/ledger/json"
24+
. "github.com/hyperledger/fabric/orderer/common/ledger"
25+
jsonledger "github.com/hyperledger/fabric/orderer/common/ledger/json"
2626
cb "github.com/hyperledger/fabric/protos/common"
2727
)
2828

‎orderer/ledger/ledger.go ‎orderer/common/ledger/ledger.go

File renamed without changes.

‎orderer/ledger/ram/factory.go ‎orderer/common/ledger/ram/factory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package ramledger
1919
import (
2020
"sync"
2121

22-
"github.com/hyperledger/fabric/orderer/ledger"
22+
"github.com/hyperledger/fabric/orderer/common/ledger"
2323
cb "github.com/hyperledger/fabric/protos/common"
2424
)
2525

‎orderer/ledger/ram/factory_test.go ‎orderer/common/ledger/ram/factory_test.go

File renamed without changes.

‎orderer/ledger/ram/impl.go ‎orderer/common/ledger/ram/impl.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"bytes"
2121
"fmt"
2222

23-
"github.com/hyperledger/fabric/orderer/ledger"
23+
"github.com/hyperledger/fabric/orderer/common/ledger"
2424
cb "github.com/hyperledger/fabric/protos/common"
2525
ab "github.com/hyperledger/fabric/protos/orderer"
2626
"github.com/op/go-logging"

‎orderer/ledger/ram/impl_test.go ‎orderer/common/ledger/ram/impl_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"testing"
2121

2222
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
23-
"github.com/hyperledger/fabric/orderer/ledger"
23+
"github.com/hyperledger/fabric/orderer/common/ledger"
2424
cb "github.com/hyperledger/fabric/protos/common"
2525
ab "github.com/hyperledger/fabric/protos/orderer"
2626

‎orderer/ledger/ram_test.go ‎orderer/common/ledger/ram_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package ledger_test
1818

1919
import (
2020
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
21-
. "github.com/hyperledger/fabric/orderer/ledger"
22-
ramledger "github.com/hyperledger/fabric/orderer/ledger/ram"
21+
. "github.com/hyperledger/fabric/orderer/common/ledger"
22+
ramledger "github.com/hyperledger/fabric/orderer/common/ledger/ram"
2323
)
2424

2525
func init() {

‎orderer/ledger/util.go ‎orderer/common/ledger/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func CreateNextBlock(rl Reader, messages []*cb.Envelope) *cb.Block {
5757
if rl.Height() > 0 {
5858
it, _ := rl.Iterator(&ab.SeekPosition{
5959
Type: &ab.SeekPosition_Newest{
60-
&ab.SeekNewest{},
60+
Newest: &ab.SeekNewest{},
6161
},
6262
})
6363
<-it.ReadyChan() // Should never block, but just in case

‎orderer/localconfig/config.go ‎orderer/common/localconfig/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
)
3636

3737
const (
38-
pkgLogID = "orderer/localconfig"
38+
pkgLogID = "orderer/common/localconfig"
3939

4040
// Prefix identifies the prefix for the orderer-related ENV vars.
4141
Prefix = "ORDERER"

‎orderer/localconfig/config_test.go ‎orderer/common/localconfig/config_test.go

File renamed without changes.

‎orderer/metadata/metadata.go ‎orderer/common/metadata/metadata.go

File renamed without changes.

‎orderer/metadata/metadata_test.go ‎orderer/common/metadata/metadata_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"testing"
1313

1414
common "github.com/hyperledger/fabric/common/metadata"
15-
"github.com/hyperledger/fabric/orderer/metadata"
15+
"github.com/hyperledger/fabric/orderer/common/metadata"
1616
"github.com/stretchr/testify/assert"
1717
)
1818

‎orderer/configupdate/configupdate.go ‎orderer/common/msgprocessor/configupdate/configupdate.go

+5-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
11
/*
2-
Copyright IBM Corp. 2017 All Rights Reserved.
2+
Copyright IBM Corp. All Rights Reserved.
33
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
4+
SPDX-License-Identifier: Apache-2.0
155
*/
166

17-
// configupdate is an implementation of the broadcast.Proccessor interface
7+
// Package configupdate is an implementation of the broadcast.Proccessor interface
188
// It facilitates the preprocessing of CONFIG_UPDATE transactions which can
199
// generate either new CONFIG transactions or new channel creation
2010
// ORDERER_TRANSACTION messages.
@@ -55,13 +45,15 @@ type Support interface {
5545
ProposeConfigUpdate(env *cb.Envelope) (*cb.ConfigEnvelope, error)
5646
}
5747

48+
// Processor implements the broadcast.ConfigProcessor interface.
5849
type Processor struct {
5950
signer crypto.LocalSigner
6051
manager SupportManager
6152
systemChannelID string
6253
systemChannelSupport Support
6354
}
6455

56+
// New creates a new instance of *Processor.
6557
func New(systemChannelID string, supportManager SupportManager, signer crypto.LocalSigner) *Processor {
6658
support, ok := supportManager.GetChain(systemChannelID)
6759
if !ok {

‎orderer/configupdate/configupdate_test.go ‎orderer/common/msgprocessor/configupdate/configupdate_test.go

File renamed without changes.

‎orderer/multichain/chainsupport.go ‎orderer/common/multichannel/chainsupport.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package multichain
17+
package multichannel
1818

1919
import (
2020
"fmt"
@@ -28,9 +28,9 @@ import (
2828
"github.com/hyperledger/fabric/orderer/common/configtxfilter"
2929
"github.com/hyperledger/fabric/orderer/common/deliver"
3030
"github.com/hyperledger/fabric/orderer/common/filter"
31+
"github.com/hyperledger/fabric/orderer/common/ledger"
3132
"github.com/hyperledger/fabric/orderer/common/sigfilter"
3233
"github.com/hyperledger/fabric/orderer/common/sizefilter"
33-
"github.com/hyperledger/fabric/orderer/ledger"
3434
cb "github.com/hyperledger/fabric/protos/common"
3535
"github.com/hyperledger/fabric/protos/utils"
3636
)

‎orderer/multichain/chainsupport_test.go ‎orderer/common/multichannel/chainsupport_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package multichain
17+
package multichannel
1818

1919
import (
2020
"testing"
@@ -23,7 +23,7 @@ import (
2323
mockconfigtx "github.com/hyperledger/fabric/common/mocks/configtx"
2424
"github.com/hyperledger/fabric/common/mocks/crypto"
2525
"github.com/hyperledger/fabric/orderer/common/filter"
26-
"github.com/hyperledger/fabric/orderer/ledger"
26+
"github.com/hyperledger/fabric/orderer/common/ledger"
2727
cb "github.com/hyperledger/fabric/protos/common"
2828
ab "github.com/hyperledger/fabric/protos/orderer"
2929
"github.com/hyperledger/fabric/protos/utils"

‎orderer/multichain/manager.go ‎orderer/common/multichannel/manager.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ Copyright IBM Corp. All Rights Reserved.
44
SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
// Package multichain tracks the channel resources for the orderer. It initially
7+
// Package multichannel tracks the channel resources for the orderer. It initially
88
// loads the set of existing channels, and provides an interface for users of these
99
// channels to retrieve them, or create new ones.
10-
package multichain
10+
package multichannel
1111

1212
import (
1313
"fmt"
@@ -16,7 +16,7 @@ import (
1616
"github.com/hyperledger/fabric/common/configtx"
1717
configtxapi "github.com/hyperledger/fabric/common/configtx/api"
1818
"github.com/hyperledger/fabric/common/policies"
19-
"github.com/hyperledger/fabric/orderer/ledger"
19+
"github.com/hyperledger/fabric/orderer/common/ledger"
2020
cb "github.com/hyperledger/fabric/protos/common"
2121
"github.com/hyperledger/fabric/protos/utils"
2222
"github.com/op/go-logging"
@@ -25,7 +25,7 @@ import (
2525
"github.com/hyperledger/fabric/common/crypto"
2626
)
2727

28-
var logger = logging.MustGetLogger("orderer/multichain")
28+
var logger = logging.MustGetLogger("orderer/multichannel")
2929

3030
const (
3131
msgVersion = int32(0)

‎orderer/multichain/manager_test.go ‎orderer/common/multichannel/manager_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Copyright IBM Corp. All Rights Reserved.
44
SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
package multichain
7+
package multichannel
88

99
import (
1010
"reflect"
@@ -18,8 +18,8 @@ import (
1818
"github.com/hyperledger/fabric/common/configtx/tool/provisional"
1919
mockcrypto "github.com/hyperledger/fabric/common/mocks/crypto"
2020
"github.com/hyperledger/fabric/msp"
21-
"github.com/hyperledger/fabric/orderer/ledger"
22-
ramledger "github.com/hyperledger/fabric/orderer/ledger/ram"
21+
"github.com/hyperledger/fabric/orderer/common/ledger"
22+
ramledger "github.com/hyperledger/fabric/orderer/common/ledger/ram"
2323
cb "github.com/hyperledger/fabric/protos/common"
2424
ab "github.com/hyperledger/fabric/protos/orderer"
2525
"github.com/hyperledger/fabric/protos/utils"

‎orderer/multichain/systemchain.go ‎orderer/common/multichannel/systemchain.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package multichain
17+
package multichannel
1818

1919
import (
2020
"fmt"

‎orderer/multichain/systemchain_test.go ‎orderer/common/multichannel/systemchain_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package multichain
17+
package multichannel
1818

1919
import (
2020
"bytes"
@@ -169,7 +169,7 @@ func TestNumChainsExceeded(t *testing.T) {
169169
func TestBadProposal(t *testing.T) {
170170
mcc := newMockChainCreator()
171171
sysFilter := newSystemChainFilter(mcc.ms, mcc)
172-
// logging.SetLevel(logging.DEBUG, "orderer/multichain")
172+
// logging.SetLevel(logging.DEBUG, "orderer/multichannel")
173173
t.Run("BadPayload", func(t *testing.T) {
174174
action, committer := sysFilter.Apply(&cb.Envelope{Payload: []byte("bad payload")})
175175
assert.EqualValues(t, action, filter.Forward, "Should of skipped invalid tx")
@@ -181,7 +181,7 @@ func TestBadProposal(t *testing.T) {
181181
logger.SetBackend(logging.AddModuleLevel(logging.NewLogBackend(&buffer, "", 0)))
182182
// reset the logger after test
183183
defer func() {
184-
logger = logging.MustGetLogger("orderer/multichain")
184+
logger = logging.MustGetLogger("orderer/multichannel")
185185
}()
186186

187187
for _, tc := range []struct {

‎orderer/multichain/util_test.go ‎orderer/common/multichannel/util_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
package multichain
17+
package multichannel
1818

1919
import (
2020
"fmt"

0 commit comments

Comments
 (0)