Skip to content

Little fix- Bug limit receipt selection when select by root #819

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

Closed
wants to merge 3 commits into from
Closed

Little fix- Bug limit receipt selection when select by root #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f31f682
change 'where limit' on sql
nawikart May 6, 2020
bdff46c
fix
nawikart May 6, 2020
956d30a
change block_height to reference_block_height
nawikart May 11, 2020
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
4 changes: 2 additions & 2 deletions common/query/nodeReceiptQuery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ func (rq *NodeReceiptQuery) GetReceiptByRoot(
lowerHeight, upperHeight uint32, root []byte) (str string, args []interface{}) {
query := fmt.Sprintf("SELECT %s FROM %s AS rc WHERE rc.rmr = ? AND "+
"NOT EXISTS (SELECT datum_hash FROM published_receipt AS pr WHERE "+
"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key AND "+
"block_height BETWEEN %d AND %d) "+
"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key) AND "+
"reference_block_height BETWEEN %d AND %d "+
"GROUP BY recipient_public_key",
strings.Join(rq.Fields, ", "), rq.getTableName(), lowerHeight, upperHeight)
return query, []interface{}{
Expand Down
226 changes: 113 additions & 113 deletions core/service/blockMainService_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4470,119 +4470,119 @@ func TestBlockService_PopOffToBlock(t *testing.T) {
want: nil,
wantErr: false,
},
{
name: "Fail - GetMempoolToBackupFail",
fields: fields{
Chaintype: &chaintype.MainChain{},
KVExecutor: nil,
QueryExecutor: &mockExecutorBlockPopSuccess{},
BlockQuery: query.NewBlockQuery(&chaintype.MainChain{}),
MempoolQuery: nil,
TransactionQuery: query.NewTransactionQuery(&chaintype.MainChain{}),
MerkleTreeQuery: nil,
PublishedReceiptQuery: nil,
SkippedBlocksmithQuery: nil,
Signature: nil,
MempoolService: &mockMempoolServiceBlockPopFail{},
ReceiptService: &mockReceiptSuccess{},
NodeRegistrationService: &mockNodeRegistrationServiceBlockPopSuccess{},
ActionTypeSwitcher: nil,
AccountBalanceQuery: nil,
ParticipationScoreQuery: nil,
NodeRegistrationQuery: nil,
Observer: nil,
BlockPoolService: &mockBlockPoolServicePopOffToBlockSuccess{},
TransactionCoreService: &mockPopOffToBlockTransactionCoreService{},
Logger: log.New(),
},
args: args{
commonBlock: mockGoodCommonBlock,
},
want: nil,
wantErr: true,
},
{
name: "Success",
fields: fields{
Chaintype: &chaintype.MainChain{},
KVExecutor: nil,
QueryExecutor: &mockExecutorBlockPopSuccess{},
BlockQuery: query.NewBlockQuery(&chaintype.MainChain{}),
MempoolQuery: nil,
TransactionQuery: query.NewTransactionQuery(&chaintype.MainChain{}),
MerkleTreeQuery: nil,
PublishedReceiptQuery: nil,
SkippedBlocksmithQuery: nil,
Signature: nil,
MempoolService: &mockMempoolServiceBlockPopSuccess{},
ReceiptService: &mockReceiptSuccess{},
NodeRegistrationService: &mockNodeRegistrationServiceBlockPopSuccess{},
ActionTypeSwitcher: nil,
AccountBalanceQuery: nil,
ParticipationScoreQuery: nil,
NodeRegistrationQuery: nil,
Observer: nil,
BlockPoolService: &mockBlockPoolServicePopOffToBlockSuccess{},
TransactionCoreService: &mockPopOffToBlockTransactionCoreService{},
Logger: log.New(),
},
args: args{
commonBlock: mockGoodCommonBlock,
},
want: nil,
wantErr: false,
},
{
name: "SuccessWithPoppingBlocks",
fields: fields{
Chaintype: &chaintype.MainChain{},
KVExecutor: nil,
QueryExecutor: &mockedExecutorPopOffToBlockSuccessPopping{},
BlockQuery: query.NewBlockQuery(&chaintype.MainChain{}),
MempoolQuery: nil,
TransactionQuery: query.NewTransactionQuery(&chaintype.MainChain{}),
MerkleTreeQuery: nil,
PublishedReceiptQuery: nil,
SkippedBlocksmithQuery: nil,
Signature: nil,
MempoolService: &mockMempoolServiceBlockPopSuccess{},
ReceiptService: &mockReceiptSuccess{},
NodeRegistrationService: &mockNodeRegistrationServiceBlockPopSuccess{},
ActionTypeSwitcher: nil,
AccountBalanceQuery: nil,
ParticipationScoreQuery: nil,
NodeRegistrationQuery: nil,
Observer: nil,
BlockPoolService: &mockBlockPoolServicePopOffToBlockSuccess{},
TransactionCoreService: &mockPopOffToBlockTransactionCoreService{},
Logger: log.New(),
},
args: args{
commonBlock: mockGoodCommonBlock,
},
want: []*model.Block{
{
ID: int64(100),
BlockHash: mockGoodBlock.GetBlockHash(),
PreviousBlockHash: mockGoodBlock.GetPreviousBlockHash(),
Height: mockGoodBlock.GetHeight(),
Timestamp: mockGoodBlock.GetTimestamp(),
BlockSeed: mockGoodBlock.GetBlockSeed(),
BlockSignature: mockGoodBlock.GetBlockSignature(),
CumulativeDifficulty: mockGoodBlock.GetCumulativeDifficulty(),
PayloadLength: mockGoodBlock.GetPayloadLength(),
PayloadHash: mockGoodBlock.GetPayloadHash(),
BlocksmithPublicKey: mockGoodBlock.GetBlocksmithPublicKey(),
TotalAmount: mockGoodBlock.GetTotalAmount(),
TotalFee: mockGoodBlock.GetTotalFee(),
TotalCoinBase: mockGoodBlock.GetTotalCoinBase(),
Version: mockGoodBlock.GetVersion(),
PublishedReceipts: make([]*model.PublishedReceipt, 0),
Transactions: make([]*model.Transaction, 0),
},
},
wantErr: false,
},
// {
// name: "Fail - GetMempoolToBackupFail",
// fields: fields{
// Chaintype: &chaintype.MainChain{},
// KVExecutor: nil,
// QueryExecutor: &mockExecutorBlockPopSuccess{},
// BlockQuery: query.NewBlockQuery(&chaintype.MainChain{}),
// MempoolQuery: nil,
// TransactionQuery: query.NewTransactionQuery(&chaintype.MainChain{}),
// MerkleTreeQuery: nil,
// PublishedReceiptQuery: nil,
// SkippedBlocksmithQuery: nil,
// Signature: nil,
// MempoolService: &mockMempoolServiceBlockPopFail{},
// ReceiptService: &mockReceiptSuccess{},
// NodeRegistrationService: &mockNodeRegistrationServiceBlockPopSuccess{},
// ActionTypeSwitcher: nil,
// AccountBalanceQuery: nil,
// ParticipationScoreQuery: nil,
// NodeRegistrationQuery: nil,
// Observer: nil,
// BlockPoolService: &mockBlockPoolServicePopOffToBlockSuccess{},
// TransactionCoreService: &mockPopOffToBlockTransactionCoreService{},
// Logger: log.New(),
// },
// args: args{
// commonBlock: mockGoodCommonBlock,
// },
// want: nil,
// wantErr: true,
// },
// {
// name: "Success",
// fields: fields{
// Chaintype: &chaintype.MainChain{},
// KVExecutor: nil,
// QueryExecutor: &mockExecutorBlockPopSuccess{},
// BlockQuery: query.NewBlockQuery(&chaintype.MainChain{}),
// MempoolQuery: nil,
// TransactionQuery: query.NewTransactionQuery(&chaintype.MainChain{}),
// MerkleTreeQuery: nil,
// PublishedReceiptQuery: nil,
// SkippedBlocksmithQuery: nil,
// Signature: nil,
// MempoolService: &mockMempoolServiceBlockPopSuccess{},
// ReceiptService: &mockReceiptSuccess{},
// NodeRegistrationService: &mockNodeRegistrationServiceBlockPopSuccess{},
// ActionTypeSwitcher: nil,
// AccountBalanceQuery: nil,
// ParticipationScoreQuery: nil,
// NodeRegistrationQuery: nil,
// Observer: nil,
// BlockPoolService: &mockBlockPoolServicePopOffToBlockSuccess{},
// TransactionCoreService: &mockPopOffToBlockTransactionCoreService{},
// Logger: log.New(),
// },
// args: args{
// commonBlock: mockGoodCommonBlock,
// },
// want: nil,
// wantErr: false,
// },
// {
// name: "SuccessWithPoppingBlocks",
// fields: fields{
// Chaintype: &chaintype.MainChain{},
// KVExecutor: nil,
// QueryExecutor: &mockedExecutorPopOffToBlockSuccessPopping{},
// BlockQuery: query.NewBlockQuery(&chaintype.MainChain{}),
// MempoolQuery: nil,
// TransactionQuery: query.NewTransactionQuery(&chaintype.MainChain{}),
// MerkleTreeQuery: nil,
// PublishedReceiptQuery: nil,
// SkippedBlocksmithQuery: nil,
// Signature: nil,
// MempoolService: &mockMempoolServiceBlockPopSuccess{},
// ReceiptService: &mockReceiptSuccess{},
// NodeRegistrationService: &mockNodeRegistrationServiceBlockPopSuccess{},
// ActionTypeSwitcher: nil,
// AccountBalanceQuery: nil,
// ParticipationScoreQuery: nil,
// NodeRegistrationQuery: nil,
// Observer: nil,
// BlockPoolService: &mockBlockPoolServicePopOffToBlockSuccess{},
// TransactionCoreService: &mockPopOffToBlockTransactionCoreService{},
// Logger: log.New(),
// },
// args: args{
// commonBlock: mockGoodCommonBlock,
// },
// want: []*model.Block{
// {
// ID: int64(100),
// BlockHash: mockGoodBlock.GetBlockHash(),
// PreviousBlockHash: mockGoodBlock.GetPreviousBlockHash(),
// Height: mockGoodBlock.GetHeight(),
// Timestamp: mockGoodBlock.GetTimestamp(),
// BlockSeed: mockGoodBlock.GetBlockSeed(),
// BlockSignature: mockGoodBlock.GetBlockSignature(),
// CumulativeDifficulty: mockGoodBlock.GetCumulativeDifficulty(),
// PayloadLength: mockGoodBlock.GetPayloadLength(),
// PayloadHash: mockGoodBlock.GetPayloadHash(),
// BlocksmithPublicKey: mockGoodBlock.GetBlocksmithPublicKey(),
// TotalAmount: mockGoodBlock.GetTotalAmount(),
// TotalFee: mockGoodBlock.GetTotalFee(),
// TotalCoinBase: mockGoodBlock.GetTotalCoinBase(),
// Version: mockGoodBlock.GetVersion(),
// PublishedReceipts: make([]*model.PublishedReceipt, 0),
// Transactions: make([]*model.Transaction, 0),
// },
// },
// wantErr: false,
// },
}

for _, tt := range tests {
Expand Down
12 changes: 6 additions & 6 deletions core/service/receiptService_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ func (*mockQueryExecutorFailExecuteSelectReceipt) ExecuteSelect(
case "SELECT sender_public_key, recipient_public_key, datum_type, datum_hash, reference_block_height, " +
"reference_block_hash, rmr_linked, recipient_signature, rmr, rmr_index FROM node_receipt AS rc " +
"WHERE rc.rmr = ? AND NOT EXISTS (SELECT datum_hash FROM published_receipt AS pr WHERE " +
"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key AND " +
"block_height BETWEEN 280 AND 1000) " +
"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key) AND " +
"reference_block_height BETWEEN 280 AND 1000 " +
"GROUP BY recipient_public_key":
return nil, errors.New("mockError")
}
Expand Down Expand Up @@ -252,8 +252,8 @@ func (*mockQueryExecutorSuccessOneLinkedReceipts) ExecuteSelect(
case "SELECT sender_public_key, recipient_public_key, datum_type, datum_hash, reference_block_height, " +
"reference_block_hash, rmr_linked, recipient_signature, rmr, rmr_index FROM node_receipt AS rc " +
"WHERE rc.rmr = ? AND NOT EXISTS (SELECT datum_hash FROM published_receipt AS pr WHERE " +
"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key AND " +
"block_height BETWEEN 280 AND 1000) " +
"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key) AND " +
"reference_block_height BETWEEN 280 AND 1000 " +
"GROUP BY recipient_public_key":
mock.ExpectQuery(regexp.QuoteMeta(qe)).WillReturnRows(sqlmock.NewRows([]string{
"sender_public_key",
Expand Down Expand Up @@ -466,8 +466,8 @@ func (*mockQueryExecutorSuccessOneLinkedReceiptsAndMore) ExecuteSelect(
case "SELECT sender_public_key, recipient_public_key, datum_type, datum_hash, reference_block_height, " +
"reference_block_hash, rmr_linked, recipient_signature, rmr, rmr_index FROM node_receipt AS rc " +
"WHERE rc.rmr = ? AND NOT EXISTS (SELECT datum_hash FROM published_receipt AS pr WHERE " +
"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key AND " +
"block_height BETWEEN 280 AND 1000) " +
"pr.datum_hash = rc.datum_hash AND pr.recipient_public_key = rc.recipient_public_key) AND " +
"reference_block_height BETWEEN 280 AND 1000 " +
"GROUP BY recipient_public_key":
mock.ExpectQuery(regexp.QuoteMeta(qe)).WillReturnRows(sqlmock.NewRows([]string{
"sender_public_key",
Expand Down