Fixed models and integration test.

dipdup-io · Apr 25, 2023 · a2e0d59 · a2e0d59
1 parent 934b454
commit a2e0d59
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 36 deletions.
diff --git a/build/expected_metadata.yml b/build/expected_metadata.yml
@@ -76,16 +76,16 @@ tables:
       - errors
       - expiration_level
       - raw
-      - bh_1_level
-      - bh_1_proto
-      - bh_1_validation_pass
-      - bh_1_priority
-      - bh_1_proof_of_work_nonce
-      - bh_2_level
-      - bh_2_proto
-      - bh_2_validation_pass
-      - bh_2_priority
-      - bh_2_proof_of_work_nonce
+      - bh1_level
+      - bh1_proto
+      - bh1_validation_pass
+      - bh1_priority
+      - bh1_proof_of_work_nonce
+      - bh2_level
+      - bh2_proto
+      - bh2_validation_pass
+      - bh2_priority
+      - bh2_proof_of_work_nonce
 
   -
     name: double_endorsings
@@ -103,10 +103,10 @@ tables:
       - errors
       - expiration_level
       - raw
-      - op_1_kind
-      - op_1_level
-      - op_2_kind
-      - op_2_level
+      - op1_kind
+      - op1_level
+      - op2_kind
+      - op2_level
 
   -
     name: double_preendorsings
@@ -124,10 +124,10 @@ tables:
       - errors
       - expiration_level
       - raw
-      - op_1_kind
-      - op_1_level
-      - op_2_kind
-      - op_2_level
+      - op1_kind
+      - op1_level
+      - op2_kind
+      - op2_level
 
   -
     name: drain_delegate

diff --git a/cmd/mempool/models/double_baking.go b/cmd/mempool/models/double_baking.go
@@ -9,17 +9,17 @@ type DoubleBaking struct {
 	Bh1 DoubleBakingInfo `json:"bh1" pg:"-"`
 	Bh2 DoubleBakingInfo `json:"bh2" pg:"-"`
 
-	Bh1Level            uint64 `json:"-" pg:"bh_1_level"`
-	Bh1Proto            int64  `json:"-" pg:"bh_1_proto"`
-	Bh1ValidationPass   int64  `json:"-" pg:"bh_1_validation_pass"`
-	Bh1Priority         int64  `json:"-" pg:"bh_1_priority"`
-	Bh1ProofOfWorkNonce string `json:"-" pg:"bh_1_proof_of_work_nonce"`
+	Bh1Level            uint64 `json:"-" pg:"bh1_level"`
+	Bh1Proto            int64  `json:"-" pg:"bh1_proto"`
+	Bh1ValidationPass   int64  `json:"-" pg:"bh1_validation_pass"`
+	Bh1Priority         int64  `json:"-" pg:"bh1_priority"`
+	Bh1ProofOfWorkNonce string `json:"-" pg:"bh1_proof_of_work_nonce"`
 
-	Bh2Level            uint64 `json:"-" pg:"bh_2_level"`
-	Bh2Proto            int64  `json:"-" pg:"bh_2_proto"`
-	Bh2ValidationPass   int64  `json:"-" pg:"bh_2_validation_pass"`
-	Bh2Priority         int64  `json:"-" pg:"bh_2_priority"`
-	Bh2ProofOfWorkNonce string `json:"-" pg:"bh_2_proof_of_work_nonce"`
+	Bh2Level            uint64 `json:"-" pg:"bh2_level"`
+	Bh2Proto            int64  `json:"-" pg:"bh2_proto"`
+	Bh2ValidationPass   int64  `json:"-" pg:"bh2_validation_pass"`
+	Bh2Priority         int64  `json:"-" pg:"bh2_priority"`
+	Bh2ProofOfWorkNonce string `json:"-" pg:"bh2_proof_of_work_nonce"`
 }
 
 // DoubleBakingInfo -

diff --git a/cmd/mempool/models/double_endorsing.go b/cmd/mempool/models/double_endorsing.go
@@ -6,10 +6,10 @@ type DoubleEndorsing struct {
 	tableName struct{} `pg:"double_endorsings"`
 
 	MempoolOperation
-	Op1Kind  string `json:"-" pg:"op_1_kind"`
-	Op1Level uint64 `json:"-" pg:"op_1_level"`
-	Op2Kind  string `json:"-" pg:"op_2_kind"`
-	Op2Level uint64 `json:"-" pg:"op_2_level"`
+	Op1Kind  string `json:"-" pg:"op1_kind"`
+	Op1Level uint64 `json:"-" pg:"op1_level"`
+	Op2Kind  string `json:"-" pg:"op2_kind"`
+	Op2Level uint64 `json:"-" pg:"op2_level"`
 
 	Op1 struct {
 		Operations DoubleEndorsingOperations `json:"operations"`

diff --git a/cmd/mempool/models/double_preendorsing.go b/cmd/mempool/models/double_preendorsing.go
@@ -6,10 +6,10 @@ type DoublePreendorsing struct {
 	tableName struct{} `pg:"double_preendorsings"`
 
 	MempoolOperation
-	Op1Kind  string `json:"-" pg:"op_1_kind"`
-	Op1Level uint64 `json:"-" pg:"op_1_level"`
-	Op2Kind  string `json:"-" pg:"op_2_kind"`
-	Op2Level uint64 `json:"-" pg:"op_2_level"`
+	Op1Kind  string `json:"-" pg:"op1_kind"`
+	Op1Level uint64 `json:"-" pg:"op1_level"`
+	Op2Kind  string `json:"-" pg:"op2_kind"`
+	Op2Level uint64 `json:"-" pg:"op2_level"`
 
 	Op1 struct {
 		Operations DoublePreendorsingOperations `json:"operations"`