Skip to content

Commit 7a1e2f5

Browse files
rename xdr2json package to xdrjson (#8)
1 parent f6f8aae commit 7a1e2f5

File tree

18 files changed

+31
-28
lines changed

18 files changed

+31
-28
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- uses: actions/upload-artifact@v4
5252
with:
5353
name: libs
54-
path: xdr2json/libs
54+
path: xdrjson/libs
5555

5656
record-attestation-of-libs:
5757
if: github.event_name == 'push' && github.ref_name == 'main'
@@ -64,10 +64,10 @@ jobs:
6464
- uses: actions/download-artifact@v4
6565
with:
6666
name: libs
67-
path: xdr2json/libs
67+
path: xdrjson/libs
6868
- uses: actions/attest-build-provenance@v1
6969
with:
70-
subject-path: xdr2json/libs/**/*.a
70+
subject-path: xdrjson/libs/**/*.a
7171

7272
build-and-test:
7373
# Building the libs is not strictly required to do this next step, but given

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
resolver = "2"
33
members = [
44
"lib/ffi",
5-
"lib/xdr2json"
5+
"lib/xdrjson"
66
]
77

88
[workspace.package]

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ TARGETS = \
1010
x86_64-unknown-linux-gnu \
1111
aarch64-unknown-linux-gnu
1212

13-
LIBS_DIR = xdr2json/libs
13+
LIBS_DIR = xdrjson/libs
1414
BUILD_DIR = target
1515
PROFILE = release-with-panic-unwind
1616

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ go test ./...
2222

2323
**TODO:**
2424

25-
* [Automate building/updates for xdr2json](https://github.com/stellar/stellar-rpc/issues/350)
25+
* [Automate building/updates for xdrjson](https://github.com/stellar/stellar-rpc/issues/350)
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "xdr2json"
2+
name = "xdrjson"
33
version.workspace = true
44
publish = false
55
edition = "2021"

xdr2json/libs/rust-version

Lines changed: 0 additions & 7 deletions
This file was deleted.
Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
//nolint:lll
2-
package xdr2json
2+
package xdrjson
33

44
/*
55
// See preflight.go for add'l explanations:
66
// Note: no blank lines allowed.
77
#include <stdlib.h>
8-
#include "../lib/xdr2json.h"
9-
#cgo windows,amd64 LDFLAGS: -L${SRCDIR}/libs/x86_64-pc-windows-gnu -lxdr2json -lntdll -static -lws2_32 -lbcrypt -luserenv
10-
#cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/libs/x86_64-apple-darwin -lxdr2json -ldl -lm
11-
#cgo darwin,arm64 LDFLAGS: -L${SRCDIR}/libs/aarch64-apple-darwin -lxdr2json -ldl -lm
12-
#cgo linux,amd64 LDFLAGS: -L${SRCDIR}/libs/x86_64-unknown-linux-gnu -lxdr2json -ldl -lm
13-
#cgo linux,arm64 LDFLAGS: -L${SRCDIR}/libs/aarch64-unknown-linux-gnu -lxdr2json -ldl -lm
8+
#include "../lib/xdrjson.h"
9+
#cgo windows,amd64 LDFLAGS: -L${SRCDIR}/libs/x86_64-pc-windows-gnu -lxdrjson -lntdll -static -lws2_32 -lbcrypt -luserenv
10+
#cgo darwin,amd64 LDFLAGS: -L${SRCDIR}/libs/x86_64-apple-darwin -lxdrjson -ldl -lm
11+
#cgo darwin,arm64 LDFLAGS: -L${SRCDIR}/libs/aarch64-apple-darwin -lxdrjson -ldl -lm
12+
#cgo linux,amd64 LDFLAGS: -L${SRCDIR}/libs/x86_64-unknown-linux-gnu -lxdrjson -ldl -lm
13+
#cgo linux,arm64 LDFLAGS: -L${SRCDIR}/libs/aarch64-unknown-linux-gnu -lxdrjson -ldl -lm
1414
1515
*/
1616
import "C"
1717

1818
import (
1919
"encoding"
2020
"encoding/json"
21-
"github.com/pkg/errors"
2221
"reflect"
2322
"unsafe"
23+
24+
"github.com/pkg/errors"
2425
)
2526

2627
// ConvertBytes takes an XDR object (`xdr`) and its serialized bytes (`field`)

0 commit comments

Comments
 (0)