deep-stack/ipld-eth-server
4
0
Fork 0
forked from cerc-io/ipld-eth-server
Code Pull Requests Activity

Add log index to Deal

Browse Source
This commit is contained in:
Rob Mulholand
2018-10-22 12:14:43 -05:00
parent 495f39abb8
commit 1aafb7201e
9 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/transformers/deal/converter.go
+1
View File
@@ -47,6 +47,7 @@ func (DealConverter) ToModels(ethLogs []types.Log) (result []DealModel, err erro
model := DealModel{
BidId: bidId.String(),
ContractAddress: log.Address.Hex(),
LogIndex: log.Index,
TransactionIndex: log.TxIndex,
Raw: raw,
}
pkg/transformers/deal/model.go
+1
View File
@@ -17,6 +17,7 @@ package deal
type DealModel struct {
BidId string `db:"bid_id"`
ContractAddress string `db:"contract_address"`
LogIndex uint `db:"log_idx"`
TransactionIndex uint `db:"tx_idx"`
Raw []byte `db:"raw_log"`
}
pkg/transformers/deal/repository.go
+3 -3
View File
@@ -38,9 +38,9 @@ func (r DealRepository) Create(headerId int64, models []DealModel) error {
}
for _, model := range models {
_, err = tx.Exec(
`INSERT into maker.deal (header_id, bid_id, contract_address, tx_idx, raw_log)
VALUES($1, $2, $3, $4, $5)`,
headerId, model.BidId, model.ContractAddress, model.TransactionIndex, model.Raw,
`INSERT into maker.deal (header_id, bid_id, contract_address, log_idx, tx_idx, raw_log)
VALUES($1, $2, $3, $4, $5, $6)`,
headerId, model.BidId, model.ContractAddress, model.LogIndex, model.TransactionIndex, model.Raw,
)
if err != nil {
tx.Rollback()
pkg/transformers/deal/repository_test.go
+2 -1
View File
@@ -57,10 +57,11 @@ var _ = Describe("Deal Repository", func() {
db.QueryRow(`SELECT count(*) FROM maker.deal`).Scan(&count)
Expect(count).To(Equal(1))
var dbResult deal.DealModel
err = db.Get(&dbResult, `SELECT bid_id, contract_address, tx_idx, raw_log FROM maker.deal WHERE header_id = $1`, headerId)
err = db.Get(&dbResult, `SELECT bid_id, contract_address, log_idx, tx_idx, raw_log FROM maker.deal WHERE header_id = $1`, headerId)
Expect(err).NotTo(HaveOccurred())
Expect(dbResult.BidId).To(Equal(test_data.DealModel.BidId))
Expect(dbResult.ContractAddress).To(Equal(test_data.DealModel.ContractAddress))
Expect(dbResult.LogIndex).To(Equal(test_data.DealModel.LogIndex))
Expect(dbResult.TransactionIndex).To(Equal(test_data.DealModel.TransactionIndex))
Expect(dbResult.Raw).To(MatchJSON(test_data.DealModel.Raw))
})