feat!: remove blobs from data (#1005)

celestiaorg · May 3, 2023 · 6e59072 · 6e59072
1 parent 9bfa856
commit 6e59072
Show file tree

Hide file tree

Showing 22 changed files with 153 additions and 380 deletions.
diff --git a/blockchain/msgs_test.go b/blockchain/msgs_test.go
@@ -81,7 +81,7 @@ func TestBcStatusResponseMessageValidateBasic(t *testing.T) {
 
 //nolint:lll // ignore line length in tests
 func TestBlockchainMessageVectors(t *testing.T) {
-	block := types.MakeBlock(int64(3), factory.MakeData([]types.Tx{types.Tx("Hello World")}, nil), nil, nil)
+	block := types.MakeBlock(int64(3), factory.MakeData([]types.Tx{types.Tx("Hello World")}), nil, nil)
 	block.Version.Block = 11 // overwrite updated protocol version
 
 	bpb, err := block.ToProto()

diff --git a/blockchain/v0/reactor_test.go b/blockchain/v0/reactor_test.go
@@ -317,7 +317,7 @@ func makeTxs(height int64) (txs []types.Tx) {
 func makeBlock(height int64, state sm.State, lastCommit *types.Commit) *types.Block {
 	block, _ := state.MakeBlock(
 		height,
-		factory.MakeData(makeTxs(height), nil),
+		factory.MakeData(makeTxs(height)),
 		lastCommit,
 		nil,
 		state.Validators.GetProposer().Address,

diff --git a/blockchain/v1/peer_test.go b/blockchain/v1/peer_test.go
@@ -277,5 +277,5 @@ func checkByStoppingPeerTimer(t *testing.T, peer *BpPeer, running bool) {
 }
 
 func makeSmallBlock(height int) *types.Block {
-	return types.MakeBlock(int64(height), factory.MakeData([]types.Tx{types.Tx("foo")}, nil), nil, nil)
+	return types.MakeBlock(int64(height), factory.MakeData([]types.Tx{types.Tx("foo")}), nil, nil)
 }
diff --git a/blockchain/v1/pool_test.go b/blockchain/v1/pool_test.go
@@ -82,7 +82,7 @@ func makeBlockPool(bcr *testBcR, height int64, peers []BpPeer, blocks map[int64]
 		bPool.peers[p.id].RequestSent(h)
 		if p.create {
 			// simulate that a block at height h has been received
-			_ = bPool.peers[p.id].AddBlock(types.MakeBlock(h, factory.MakeData(txs, nil), nil, nil), 100)
+			_ = bPool.peers[p.id].AddBlock(types.MakeBlock(h, factory.MakeData(txs), nil, nil), 100)
 		}
 	}
 	return bPool
@@ -393,7 +393,7 @@ func TestBlockPoolAddBlock(t *testing.T) {
 			pool: makeBlockPool(testBcR, 10, []BpPeer{{ID: "P1", Height: 100}}, map[int64]tPBlocks{}),
 			args: args{
 				peerID:    "P2",
-				block:     types.MakeBlock(int64(10), factory.MakeData(txs, nil), nil, nil),
+				block:     types.MakeBlock(int64(10), factory.MakeData(txs), nil, nil),
 				blockSize: 100,
 			},
 			poolWanted: makeBlockPool(testBcR, 10, []BpPeer{{ID: "P1", Height: 100}}, map[int64]tPBlocks{}),
@@ -405,7 +405,7 @@ func TestBlockPoolAddBlock(t *testing.T) {
 				map[int64]tPBlocks{10: {"P1", false}}),
 			args: args{
 				peerID:    "P1",
-				block:     types.MakeBlock(int64(11), factory.MakeData(txs, nil), nil, nil),
+				block:     types.MakeBlock(int64(11), factory.MakeData(txs), nil, nil),
 				blockSize: 100,
 			},
 			poolWanted: makeBlockPool(testBcR, 10,
@@ -419,7 +419,7 @@ func TestBlockPoolAddBlock(t *testing.T) {
 				map[int64]tPBlocks{10: {"P1", true}, 11: {"P1", false}}),
 			args: args{
 				peerID:    "P1",
-				block:     types.MakeBlock(int64(10), factory.MakeData(txs, nil), nil, nil),
+				block:     types.MakeBlock(int64(10), factory.MakeData(txs), nil, nil),
 				blockSize: 100,
 			},
 			poolWanted: makeBlockPool(testBcR, 10,
@@ -433,7 +433,7 @@ func TestBlockPoolAddBlock(t *testing.T) {
 				map[int64]tPBlocks{10: {"P1", false}}),
 			args: args{
 				peerID:    "P2",
-				block:     types.MakeBlock(int64(10), factory.MakeData(txs, nil), nil, nil),
+				block:     types.MakeBlock(int64(10), factory.MakeData(txs), nil, nil),
 				blockSize: 100,
 			},
 			poolWanted: makeBlockPool(testBcR, 10,
@@ -447,7 +447,7 @@ func TestBlockPoolAddBlock(t *testing.T) {
 				map[int64]tPBlocks{10: {"P1", false}}),
 			args: args{
 				peerID:    "P1",
-				block:     types.MakeBlock(int64(10), factory.MakeData(txs, nil), nil, nil),
+				block:     types.MakeBlock(int64(10), factory.MakeData(txs), nil, nil),
 				blockSize: 100,
 			},
 			poolWanted: makeBlockPool(testBcR, 10,

diff --git a/blockchain/v1/reactor_fsm_test.go b/blockchain/v1/reactor_fsm_test.go
@@ -143,7 +143,7 @@ func sBlockRespEv(current, expected string, peerID p2p.ID, height int64, prevBlo
 		data: bReactorEventData{
 			peerID: peerID,
 			height: height,
-			block:  types.MakeBlock(height, factory.MakeData(txs, nil), nil, nil),
+			block:  types.MakeBlock(height, factory.MakeData(txs), nil, nil),
 			length: 100},
 		wantState:     expected,
 		wantNewBlocks: append(prevBlocks, height),
@@ -160,7 +160,7 @@ func sBlockRespEvErrored(current, expected string,
 		data: bReactorEventData{
 			peerID: peerID,
 			height: height,
-			block:  types.MakeBlock(height, factory.MakeData(txs, nil), nil, nil),
+			block:  types.MakeBlock(height, factory.MakeData(txs), nil, nil),
 			length: 100},
 		wantState:        expected,
 		wantErr:          wantErr,

diff --git a/blockchain/v1/reactor_test.go b/blockchain/v1/reactor_test.go
@@ -384,7 +384,7 @@ func makeTxs(height int64) (txs []types.Tx) {
 func makeBlock(height int64, state sm.State, lastCommit *types.Commit) *types.Block {
 	block, _ := state.MakeBlock(
 		height,
-		factory.MakeData(makeTxs(height), nil),
+		factory.MakeData(makeTxs(height)),
 		lastCommit,
 		nil,
 		state.Validators.GetProposer().Address,

diff --git a/blockchain/v2/reactor_test.go b/blockchain/v2/reactor_test.go
@@ -473,7 +473,7 @@ func makeTxs(height int64) (txs []types.Tx) {
 func makeBlock(height int64, state sm.State, lastCommit *types.Commit) *types.Block {
 	block, _ := state.MakeBlock(
 		height,
-		factory.MakeData(makeTxs(height), nil),
+		factory.MakeData(makeTxs(height)),
 		lastCommit,
 		nil,
 		state.Validators.GetProposer().Address,

diff --git a/consensus/replay_test.go b/consensus/replay_test.go
@@ -1008,7 +1008,7 @@ func makeBlock(state sm.State, lastBlock *types.Block, lastBlockMeta *types.Bloc
 
 	return state.MakeBlock(
 		height,
-		factory.MakeData([]types.Tx{}, nil),
+		factory.MakeData([]types.Tx{}),
 		lastCommit,
 		nil,
 		state.Validators.GetProposer().Address,

diff --git a/evidence/pool_test.go b/evidence/pool_test.go
@@ -193,7 +193,7 @@ func TestEvidencePoolUpdate(t *testing.T) {
 	ev := types.NewMockDuplicateVoteEvidenceWithValidator(height, defaultEvidenceTime.Add(21*time.Minute),
 		val, evidenceChainID)
 	lastCommit := makeCommit(height, val.PrivKey.PubKey().Address())
-	block := types.MakeBlock(height+1, factory.MakeData([]types.Tx{}, nil), lastCommit, []types.Evidence{ev})
+	block := types.MakeBlock(height+1, factory.MakeData([]types.Tx{}), lastCommit, []types.Evidence{ev})
 
 	// update state (partially)
 	state.LastBlockHeight = height + 1
@@ -407,7 +407,7 @@ func initializeBlockStore(db dbm.DB, state sm.State, valAddr []byte) *store.Bloc
 
 	for i := int64(1); i <= state.LastBlockHeight; i++ {
 		lastCommit := makeCommit(i-1, valAddr)
-		block, _ := state.MakeBlock(i, factory.MakeData([]types.Tx{}, nil), lastCommit, nil,
+		block, _ := state.MakeBlock(i, factory.MakeData([]types.Tx{}), lastCommit, nil,
 			state.Validators.GetProposer().Address)
 		block.Header.Time = defaultEvidenceTime.Add(time.Duration(i) * time.Minute)
 		block.Header.Version = cmtversion.Consensus{Block: version.BlockProtocol, App: 1}