Add go_package option and change imports for proper Go code generation

philippgille · Jun 23, 2019 · 0138dd3 · 0138dd3
1 parent e5b86ee
commit 0138dd3
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 21 deletions.
diff --git a/rpc/admission_control/admission_control.proto b/rpc/admission_control/admission_control.proto
@@ -3,12 +3,14 @@
 
 syntax = "proto3";
 
+option go_package = "github.com/philippgille/libra-sdk-go/rpc/admission_control";
+
 package admission_control;
 
-import "get_with_proof.proto";
-import "mempool_status.proto";
-import "transaction.proto";
-import "vm_errors.proto";
+import "types/get_with_proof.proto";
+import "mempool/mempool_status.proto";
+import "types/transaction.proto";
+import "types/vm_errors.proto";
 
 // -----------------------------------------------------------------------------
 // ---------------- Submit transaction

diff --git a/rpc/mempool/mempool_status.proto b/rpc/mempool/mempool_status.proto
@@ -3,6 +3,8 @@
 
 syntax = "proto3";
 
+option go_package = "github.com/philippgille/libra-sdk-go/rpc/mempool";
+
 package mempool;
 
 enum MempoolAddTransactionStatus {

diff --git a/rpc/types/access_path.proto b/rpc/types/access_path.proto
@@ -3,6 +3,8 @@
 
 syntax = "proto3";
 
+option go_package = "github.com/philippgille/libra-sdk-go/rpc/types";
+
 package types;
 
 message AccessPath {

diff --git a/rpc/types/account_state_blob.proto b/rpc/types/account_state_blob.proto
@@ -3,9 +3,11 @@
 
 syntax = "proto3";
 
+option go_package = "github.com/philippgille/libra-sdk-go/rpc/types";
+
 package types;
 
-import "proof.proto";
+import "types/proof.proto";
 
 message AccountStateBlob { bytes blob = 1; }
 

diff --git a/rpc/types/events.proto b/rpc/types/events.proto
@@ -7,10 +7,12 @@
 
 syntax = "proto3";
 
+option go_package = "github.com/philippgille/libra-sdk-go/rpc/types";
+
 package types;
 
-import "access_path.proto";
-import "proof.proto";
+import "types/access_path.proto";
+import "types/proof.proto";
 
 // An event emitted from a smart contract
 message Event {

diff --git a/rpc/types/get_with_proof.proto b/rpc/types/get_with_proof.proto
@@ -108,14 +108,16 @@
 //      returned
 syntax = "proto3";
 
+option go_package = "github.com/philippgille/libra-sdk-go/rpc/types";
+
 package types;
 
-import "access_path.proto";
-import "account_state_blob.proto";
-import "events.proto";
-import "ledger_info.proto";
-import "transaction.proto";
-import "validator_change.proto";
+import "types/access_path.proto";
+import "types/account_state_blob.proto";
+import "types/events.proto";
+import "types/ledger_info.proto";
+import "types/transaction.proto";
+import "types/validator_change.proto";
 
 // -----------------------------------------------------------------------------
 // ---------------- Update to latest ledger request

diff --git a/rpc/types/ledger_info.proto b/rpc/types/ledger_info.proto
@@ -3,6 +3,8 @@
 
 syntax = "proto3";
 
+option go_package = "github.com/philippgille/libra-sdk-go/rpc/types";
+
 package types;
 
 /// Even though we don't always need all hashes, we pass them in and return them

diff --git a/rpc/types/proof.proto b/rpc/types/proof.proto
@@ -3,9 +3,11 @@
 
 syntax = "proto3";
 
+option go_package = "github.com/philippgille/libra-sdk-go/rpc/types";
+
 package types;
 
-import "transaction_info.proto";
+import "types/transaction_info.proto";
 
 message AccumulatorProof {
   // The bitmap indicating which siblings are default. 1 means non-default and

diff --git a/rpc/types/transaction.proto b/rpc/types/transaction.proto
@@ -3,12 +3,14 @@
 
 syntax = "proto3";
 
+option go_package = "github.com/philippgille/libra-sdk-go/rpc/types";
+
 package types;
 
-import "access_path.proto";
-import "events.proto";
-import "proof.proto";
-import "transaction_info.proto";
+import "types/access_path.proto";
+import "types/events.proto";
+import "types/proof.proto";
+import "types/transaction_info.proto";
 import "google/protobuf/wrappers.proto";
 
 // A generic structure that describes a transaction that a client submits

diff --git a/rpc/types/transaction_info.proto b/rpc/types/transaction_info.proto
@@ -3,6 +3,8 @@
 
 syntax = "proto3";
 
+option go_package = "github.com/philippgille/libra-sdk-go/rpc/types";
+
 package types;
 
 // `TransactionInfo` is the object we store in the transaction accumulator. It

diff --git a/rpc/types/validator_change.proto b/rpc/types/validator_change.proto
@@ -3,10 +3,12 @@
 
 syntax = "proto3";
 
+option go_package = "github.com/philippgille/libra-sdk-go/rpc/types";
+
 package types;
 
-import "events.proto";
-import "ledger_info.proto";
+import "types/events.proto";
+import "types/ledger_info.proto";
 
 // This is used to prove validator changes.  When a validator is changing, it
 // triggers an event on /validator_change_account/events/sent.  To tell the

diff --git a/rpc/types/validator_public_keys.proto b/rpc/types/validator_public_keys.proto
@@ -3,6 +3,8 @@
 
 syntax = "proto3";
 
+option go_package = "github.com/philippgille/libra-sdk-go/rpc/types";
+
 package types;
 
 // Protobuf definition for the Rust struct ValidatorPublicKeys

diff --git a/rpc/types/validator_set.proto b/rpc/types/validator_set.proto
@@ -3,9 +3,11 @@
 
 syntax = "proto3";
 
+option go_package = "github.com/philippgille/libra-sdk-go/rpc/types";
+
 package types;
 
-import "validator_public_keys.proto";
+import "types/validator_public_keys.proto";
 
 // Protobuf definition for the Rust struct ValidatorSet.
 message ValidatorSet {

diff --git a/rpc/types/vm_errors.proto b/rpc/types/vm_errors.proto
@@ -3,6 +3,8 @@
 
 syntax = "proto3";
 
+option go_package = "github.com/philippgille/libra-sdk-go/rpc/types";
+
 package types;
 
 // The statuses and errors produced by the VM can be categorized into a