Add stellar/xdrgen#68

2opremio · Nov 10, 2021 · 8092ab8 · 8092ab8
1 parent acfbcf6
commit 8092ab8
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/stellar/xdrgen.git
-  revision: 92a28e1f3ef3a2b7e9409a2baa2c5ed0751d3e1c
+  revision: 4677de9fcda28ce314415b3246211ec4657a0eab
   ref: master
   specs:
     xdrgen (0.1.1)
@@ -41,7 +41,7 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     memoist (0.11.0)
     method_source (1.0.0)
@@ -79,4 +79,4 @@ DEPENDENCIES
   xdrgen!
 
 BUNDLED WITH
-   2.2.22
+   2.2.29
diff --git a/Makefile b/Makefile
@@ -8,6 +8,8 @@ xdr/Stellar-overlay.x \
 xdr/Stellar-transaction.x \
 xdr/Stellar-types.x
 
+.PHONY: xdr
+
 keystore:
 	$(MAKE) -C services/keystore/ docker-build
 

diff --git a/Rakefile b/Rakefile
@@ -40,7 +40,6 @@ namespace :xdr do
     require "pathname"
     require "xdrgen"
     require 'fileutils'
-    FileUtils.rm_f("xdr/xdr_generated.go")
 
     compilation = Xdrgen::Compilation.new(
       LOCAL_XDR_PATHS,

diff --git a/benchmarks/xdr_test.go b/benchmarks/xdr_test.go
@@ -5,6 +5,7 @@ import (
 	"encoding/base64"
 	"testing"
 
+	xdr3 "github.com/stellar/go-xdr/xdr3"
 	"github.com/stellar/go/gxdr"
 	"github.com/stellar/go/xdr"
 	goxdr "github.com/xdrpp/goxdr/xdr"
@@ -66,7 +67,7 @@ func BenchmarkGXDRUnmarshal(b *testing.B) {
 
 func BenchmarkXDRMarshalWithReflection(b *testing.B) {
 	for i := 0; i < b.N; i++ {
-		_, _ = xdr.Marshal(&bytes.Buffer{}, xdrInput)
+		_, _ = xdr3.Marshal(&bytes.Buffer{}, xdrInput)
 	}
 }
 

diff --git a/xdr/xdr_generated.go b/xdr/xdr_generated.go
@@ -1064,7 +1064,7 @@ func (e Thresholds) XDRMaxSize() int {
 }
 
 // EncodeTo encodes this value using the Encoder.
-func (s Thresholds) EncodeTo(e *xdr.Encoder) error {
+func (s *Thresholds) EncodeTo(e *xdr.Encoder) error {
 	var err error
 	_, err = e.EncodeFixedOpaque(s[:])
 	if err != nil {
@@ -1327,7 +1327,7 @@ type PoolId Hash
 // EncodeTo encodes this value using the Encoder.
 func (s PoolId) EncodeTo(e *xdr.Encoder) error {
 	var err error
-	err = Hash(s).EncodeTo(e)
+	err = (*Hash)(&s).EncodeTo(e)
 	if err != nil {
 		return err
 	}
@@ -1371,7 +1371,7 @@ func (e AssetCode4) XDRMaxSize() int {
 }
 
 // EncodeTo encodes this value using the Encoder.
-func (s AssetCode4) EncodeTo(e *xdr.Encoder) error {
+func (s *AssetCode4) EncodeTo(e *xdr.Encoder) error {
 	var err error
 	_, err = e.EncodeFixedOpaque(s[:])
 	if err != nil {
@@ -1417,7 +1417,7 @@ func (e AssetCode12) XDRMaxSize() int {
 }
 
 // EncodeTo encodes this value using the Encoder.
-func (s AssetCode12) EncodeTo(e *xdr.Encoder) error {
+func (s *AssetCode12) EncodeTo(e *xdr.Encoder) error {
 	var err error
 	_, err = e.EncodeFixedOpaque(s[:])
 	if err != nil {
@@ -25927,7 +25927,7 @@ func (e Hash) XDRMaxSize() int {
 }
 
 // EncodeTo encodes this value using the Encoder.
-func (s Hash) EncodeTo(e *xdr.Encoder) error {
+func (s *Hash) EncodeTo(e *xdr.Encoder) error {
 	var err error
 	_, err = e.EncodeFixedOpaque(s[:])
 	if err != nil {
@@ -25973,7 +25973,7 @@ func (e Uint256) XDRMaxSize() int {
 }
 
 // EncodeTo encodes this value using the Encoder.
-func (s Uint256) EncodeTo(e *xdr.Encoder) error {
+func (s *Uint256) EncodeTo(e *xdr.Encoder) error {
 	var err error
 	_, err = e.EncodeFixedOpaque(s[:])
 	if err != nil {
@@ -26747,7 +26747,7 @@ func (e SignatureHint) XDRMaxSize() int {
 }
 
 // EncodeTo encodes this value using the Encoder.
-func (s SignatureHint) EncodeTo(e *xdr.Encoder) error {
+func (s *SignatureHint) EncodeTo(e *xdr.Encoder) error {
 	var err error
 	_, err = e.EncodeFixedOpaque(s[:])
 	if err != nil {