From 3d668cc1bd86559ff95df9b12beee12c63b9fc23 Mon Sep 17 00:00:00 2001 From: Elichai Turkel Date: Wed, 10 Mar 2021 16:33:51 +0200 Subject: [PATCH] Remove old constants and print actual grpc server address (#1595) * Remove unneeded old constants in the p2p * Print the actual address of the grpc server Co-authored-by: Ori Newman --- app/appmessage/p2p_msgblock.go | 13 ------------- .../netadapter/server/grpcserver/grpc_server.go | 2 +- .../server/grpcserver/protowire/p2p_block.go | 15 --------------- .../server/grpcserver/protowire/p2p_header.go | 10 ---------- 4 files changed, 1 insertion(+), 39 deletions(-) diff --git a/app/appmessage/p2p_msgblock.go b/app/appmessage/p2p_msgblock.go index 4436d40e8..1506e8154 100644 --- a/app/appmessage/p2p_msgblock.go +++ b/app/appmessage/p2p_msgblock.go @@ -15,19 +15,6 @@ import ( // backing array multiple times. const defaultTransactionAlloc = 2048 -// MaxMassAcceptedByBlock is the maximum total transaction mass a block may accept. -const MaxMassAcceptedByBlock = 10000000 - -// MaxMassPerTx is the maximum total mass a transaction may have. -const MaxMassPerTx = MaxMassAcceptedByBlock / 2 - -// MaxTxPerBlock is the maximum number of transactions that could -// possibly fit into a block. -const MaxTxPerBlock = (MaxMassAcceptedByBlock / minTxPayload) + 1 - -// MaxBlockParents is the maximum allowed number of parents for block. -const MaxBlockParents = 10 - // TxLoc holds locator data for the offset and length of where a transaction is // located within a MsgBlock data buffer. type TxLoc struct { diff --git a/infrastructure/network/netadapter/server/grpcserver/grpc_server.go b/infrastructure/network/netadapter/server/grpcserver/grpc_server.go index 9a303fe24..1c445f350 100644 --- a/infrastructure/network/netadapter/server/grpcserver/grpc_server.go +++ b/infrastructure/network/netadapter/server/grpcserver/grpc_server.go @@ -57,7 +57,7 @@ func (s *gRPCServer) listenOn(listenAddr string) error { } }) - log.Infof("%s Server listening on %s", s.name, listenAddr) + log.Infof("%s Server listening on %s", s.name, listener.Addr()) return nil } diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block.go index 1279a3d05..0fab264e7 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_block.go @@ -21,11 +21,6 @@ func (x *BlockMessage) toAppMessage() (*appmessage.MsgBlock, error) { if x == nil { return nil, errors.Wrap(errorNil, "BlockMessage is nil") } - if len(x.Transactions) > appmessage.MaxTxPerBlock { - return nil, errors.Errorf("too many transactions to fit into a block "+ - "[count %d, max %d]", len(x.Transactions), appmessage.MaxTxPerBlock) - } - header, err := x.Header.toAppMessage() if err != nil { return nil, err @@ -47,16 +42,6 @@ func (x *BlockMessage) toAppMessage() (*appmessage.MsgBlock, error) { } func (x *BlockMessage) fromAppMessage(msgBlock *appmessage.MsgBlock) error { - if len(msgBlock.Transactions) > appmessage.MaxTxPerBlock { - return errors.Errorf("too many transactions to fit into a block "+ - "[count %d, max %d]", len(msgBlock.Transactions), appmessage.MaxTxPerBlock) - } - - if len(msgBlock.Header.ParentHashes) > appmessage.MaxBlockParents { - return errors.Errorf("block header has %d parents, but the maximum allowed amount "+ - "is %d", len(msgBlock.Header.ParentHashes), appmessage.MaxBlockParents) - } - protoHeader := new(BlockHeaderMessage) err := protoHeader.fromAppMessage(&msgBlock.Header) if err != nil { diff --git a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_header.go b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_header.go index 708e12da7..2d5337f67 100644 --- a/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_header.go +++ b/infrastructure/network/netadapter/server/grpcserver/protowire/p2p_header.go @@ -11,11 +11,6 @@ func (x *BlockHeaderMessage) toAppMessage() (*appmessage.MsgBlockHeader, error) if x == nil { return nil, errors.Wrapf(errorNil, "BlockHeaderMessage is nil") } - if len(x.ParentHashes) > appmessage.MaxBlockParents { - return nil, errors.Errorf("block header has %d parents, but the maximum allowed amount "+ - "is %d", len(x.ParentHashes), appmessage.MaxBlockParents) - } - parentHashes, err := protoHashesToDomain(x.ParentHashes) if err != nil { return nil, err @@ -48,11 +43,6 @@ func (x *BlockHeaderMessage) toAppMessage() (*appmessage.MsgBlockHeader, error) } func (x *BlockHeaderMessage) fromAppMessage(msgBlockHeader *appmessage.MsgBlockHeader) error { - if len(msgBlockHeader.ParentHashes) > appmessage.MaxBlockParents { - return errors.Errorf("block header has %d parents, but the maximum allowed amount "+ - "is %d", len(msgBlockHeader.ParentHashes), appmessage.MaxBlockParents) - } - *x = BlockHeaderMessage{ Version: uint32(msgBlockHeader.Version), ParentHashes: domainHashesToProto(msgBlockHeader.ParentHashes),