mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix PB enum

Browse source 
As PB handles enums globally there must not be same entries in 2 diff.
enums. Therefore I postfixed with _OUTPUT 3 entries in TxOutputType.
This commit is contained in:
Manfred Karrer 2018-10-03 17:32:34 -05:00
parent 275286690b
commit e11e2b3c9e
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/src/main/proto/pb.proto
View file

@ -1385,7 +1385,7 @@ message TxOutput {
enum TxOutputType { enum TxOutputType {
PB_ERROR_TX_OUTPUT_TYPE = 0; PB_ERROR_TX_OUTPUT_TYPE = 0;
UNDEFINED = 1; UNDEFINED_OUTPUT = 1;
GENESIS_OUTPUT = 2; GENESIS_OUTPUT = 2;
BSQ_OUTPUT = 3; BSQ_OUTPUT = 3;
BTC_OUTPUT = 4; BTC_OUTPUT = 4;
@ -1397,9 +1397,9 @@ enum TxOutputType {
BLIND_VOTE_OP_RETURN_OUTPUT = 10; BLIND_VOTE_OP_RETURN_OUTPUT = 10;
VOTE_REVEAL_UNLOCK_STAKE_OUTPUT = 11; VOTE_REVEAL_UNLOCK_STAKE_OUTPUT = 11;
VOTE_REVEAL_OP_RETURN_OUTPUT = 12; VOTE_REVEAL_OP_RETURN_OUTPUT = 12;
LOCKUP = 13; LOCKUP_OUTPUT = 13;
LOCKUP_OP_RETURN_OUTPUT = 14; LOCKUP_OP_RETURN_OUTPUT = 14;
UNLOCK = 15; UNLOCK_OUTPUT = 15;
INVALID_OUTPUT = 16; INVALID_OUTPUT = 16;
} }

6
core/src/main/java/bisq/core/dao/state/blockchain/TxOutputType.java
View file

@ -22,7 +22,7 @@ import bisq.common.proto.ProtoUtil;
import io.bisq.generated.protobuffer.PB; import io.bisq.generated.protobuffer.PB;
public enum TxOutputType { public enum TxOutputType {
UNDEFINED, UNDEFINED_OUTPUT,
GENESIS_OUTPUT, GENESIS_OUTPUT,
BSQ_OUTPUT, BSQ_OUTPUT,
BTC_OUTPUT, BTC_OUTPUT,
@ -34,9 +34,9 @@ public enum TxOutputType {
BLIND_VOTE_OP_RETURN_OUTPUT, BLIND_VOTE_OP_RETURN_OUTPUT,
VOTE_REVEAL_UNLOCK_STAKE_OUTPUT, VOTE_REVEAL_UNLOCK_STAKE_OUTPUT,
VOTE_REVEAL_OP_RETURN_OUTPUT, VOTE_REVEAL_OP_RETURN_OUTPUT,
LOCKUP, LOCKUP_OUTPUT,
LOCKUP_OP_RETURN_OUTPUT, LOCKUP_OP_RETURN_OUTPUT,
UNLOCK, UNLOCK_OUTPUT,
INVALID_OUTPUT; INVALID_OUTPUT;