From ac3f3c0ed51f2361c87b40e5074736d7008e52fe Mon Sep 17 00:00:00 2001 From: Michael Zhou Date: Mon, 7 Dec 2020 12:56:17 +0800 Subject: [PATCH] Change bindings package name (#109) * Change bindings package name * CircleCI nit * Update genfiles and bindings by build bot Truffle v5.1.56 (core: 5.1.56) Solidity - 0.5.17 (solc-js) Node v14.15.1 Web3.js v1.2.9 Co-authored-by: Build Bot --- .circleci/config.yml | 2 +- bindings/go/{mainchain => sgncontracts}/dpos.go | 2 +- bindings/go/{mainchain => sgncontracts}/sgn.go | 2 +- gen_and_push.sh | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) rename bindings/go/{mainchain => sgncontracts}/dpos.go (99%) rename bindings/go/{mainchain => sgncontracts}/sgn.go (99%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5f69766..09ef978 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ jobs: - run: name: update genfiles and sync go bindings if PR command: | - if [ -n "${CIRCLE_PULL_REQUEST##*/}" ]; then + if [[ ! -z $CIRCLE_PULL_REQUEST ]]; then bash ./gen_and_push.sh "${CIRCLE_PULL_REQUEST##*/}" "$CIRCLE_BRANCH" fi - save_cache: diff --git a/bindings/go/mainchain/dpos.go b/bindings/go/sgncontracts/dpos.go similarity index 99% rename from bindings/go/mainchain/dpos.go rename to bindings/go/sgncontracts/dpos.go index 51708d1..1eeee0d 100644 --- a/bindings/go/mainchain/dpos.go +++ b/bindings/go/sgncontracts/dpos.go @@ -1,7 +1,7 @@ // Code generated - DO NOT EDIT. // This file is a generated binding and any manual changes will be lost. -package mainchain +package sgncontracts import ( "math/big" diff --git a/bindings/go/mainchain/sgn.go b/bindings/go/sgncontracts/sgn.go similarity index 99% rename from bindings/go/mainchain/sgn.go rename to bindings/go/sgncontracts/sgn.go index 2e211a9..6f5eb20 100644 --- a/bindings/go/mainchain/sgn.go +++ b/bindings/go/sgncontracts/sgn.go @@ -1,7 +1,7 @@ // Code generated - DO NOT EDIT. // This file is a generated binding and any manual changes will be lost. -package mainchain +package sgncontracts import ( "math/big" diff --git a/gen_and_push.sh b/gen_and_push.sh index 0dbed8a..6e04a6e 100755 --- a/gen_and_push.sh +++ b/gen_and_push.sh @@ -43,6 +43,7 @@ commit_and_push() { # $1 is contract abi/bin name, $2 is go pkg name abigen_files() { + mkdir -p $2/$3 ./node_modules/.bin/abigen -abi ./genfiles/$1.abi -bin ./genfiles/$1.bin -pkg $3 -type $1 -out $2/$3/$4.go } @@ -53,8 +54,8 @@ sync_go_binding() { echo sgn-contract PR Head Commit: $PR_COMMIT_ID git status echo "abigen files ..." - abigen_files DPoS bindings/go mainchain dpos - abigen_files SGN bindings/go mainchain sgn + abigen_files DPoS bindings/go sgncontracts dpos + abigen_files SGN bindings/go sgncontracts sgn } echo "update go binding ..."