Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion common/ledger/blkstorage/block_serialization_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func TestSerializedBlockInfo(t *testing.T) {
testSerializedBlockInfo(t, block, c)
})

t.Run("malformed tx-envelop for one of the transactions", func(t *testing.T) {
t.Run("malformed tx-envelope for one of the transactions", func(t *testing.T) {
block := testutil.ConstructTestBlock(t, 1, 10, 100)
// malformed Payload for
block.Data.Data[1] = protoutil.MarshalOrPanic(&common.Envelope{
Expand Down
5 changes: 2 additions & 3 deletions common/ledger/blockledger/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,9 @@ func (nfei *NotFoundErrorIterator) ReadyChan() <-chan struct{} {
func (nfei *NotFoundErrorIterator) Close() {}

// CreateNextBlock provides a utility way to construct the next block from
// contents and metadata for a given ledger
// contents and metadata for a given ledger.
// XXX This will need to be modified to accept marshaled envelopes
//
// to accommodate non-deterministic marshaling
// to accommodate non-deterministic marshaling.
func CreateNextBlock(rl Reader, messages []*cb.Envelope) *cb.Block {
var nextBlockNumber uint64
var previousBlockHash []byte
Expand Down
4 changes: 2 additions & 2 deletions common/ledger/testutil/test_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ func constructBytesProposalResponsePayload(channelID string, ccid *pb.ChaincodeI
return presp.Payload, nil
}

// ConstructSignedTxEnvWithDefaultSigner constructs a transaction envelop for tests with a default signer.
// ConstructSignedTxEnvWithDefaultSigner constructs a transaction envelope for tests with a default signer.
// This method helps other modules to construct a transaction with supplied parameters
func ConstructSignedTxEnvWithDefaultSigner(
chainID string,
Expand Down Expand Up @@ -386,7 +386,7 @@ func ConstructUnsignedTxEnv(
)
}

// ConstructSignedTxEnv constructs a transaction envelop for tests
// ConstructSignedTxEnv constructs a transaction envelope for tests
func ConstructSignedTxEnv(
channelID string,
ccid *pb.ChaincodeID,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func testGenerateSampleRWSet(t *testing.T) []byte {

txid := util.GenerateUUID()

// perform a range query for significant larger scan so that the merkle tree building kicks in
// perform a range query for significantly larger scan so that the merkle tree building kicks in
// each level contains max 50 nodes per the current configuration
simulator, err := ledger.NewTxSimulator(txid)
require.NoError(t, err)
Expand Down