Skip to content

Commit

Permalink
Merge pull request #114 from simelo/stdevHan_t113_update_submodule
Browse files Browse the repository at this point in the history
Fixes #113 Change submodule to SkycoinProject/skycoin
  • Loading branch information
stdevMac authored Dec 9, 2019
2 parents e895883 + 3701480 commit 9796730
Show file tree
Hide file tree
Showing 61 changed files with 176 additions and 175 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "vendor/github.com/skycoin/skycoin"]
path = vendor/github.com/skycoin/skycoin
url = https://github.com/skycoin/skycoin
[submodule "vendor/github.com/SkycoinProject/skycoin"]
path = vendor/github.com/SkycoinProject/skycoin
url = https://github.com/SkycoinProject/skycoin
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## Unreleased
- Change submodule from `https://github.com/skycoin/skycoin` to `https://github.com/SkycoinProject/skycoin`

### Added

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ LIBSRC_SKYSRCREL_PATH = ../../../..
# --- Relative path to libskycoin vendor directory
LIBVENDOR_REL_PATH = vendor
# --- Relative path to Skycoin source code submodule
SKYSRC_REL_PATH = $(LIBVENDOR_REL_PATH)/github.com/skycoin/skycoin
SKYSRC_REL_PATH = $(LIBVENDOR_REL_PATH)/github.com/SkycoinProject/skycoin
# --- Relative path to Skycoin vendor directory
SKYVENDOR_REL_PATH = $(SKYSRC_REL_PATH)/vendor

Expand Down Expand Up @@ -223,7 +223,7 @@ install-deps-libc-Darwin: configure-build ## Install locally dependencies for te
install-deps: install-deps-libc install-deps-skyapi ## Install deps for libc and skyapi

format: ## Formats the code. Must have goimports installed (use make install-linters).
goimports -w -local github.com/skycoin/skycoin ./lib
goimports -w -local github.com/SkycoinProject/skycoin ./lib

clean-libc: ## Clean files generated by libc
rm -rfv $(BUILDLIB_DIR)
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ It is also the foundation to build client libraries for other programming langua
* [Skycoin Docs](https://www.skycoin.net/docs)
* [Skycoin Blockchain Explorer](https://explorer.skycoin.net)
* [Skycoin Development Telegram Channel](https://t.me/skycoindev)
* [Skycoin Github Wiki](https://github.com/skycoin/skycoin/wiki)
* [Skycoin Github Wiki](https://github.com/SkycoinProject/skycoin/wiki)

## Subprojects

Expand Down Expand Up @@ -81,7 +81,7 @@ $ make test-libc
0. If the `master` branch has commits that are not in `develop` (e.g. due to a hotfix applied to `master`), merge `master` into `develop` (and fix any build or test failures)
0. Switch to a new release branch named `release-X.Y.Z` for preparing the release.
0. If the release process needs modifications, edit these steps before moving forward
0. Ensure that the submodule at `vendor/github.com/skycoin/skycoin` is in sync with respect to the corresponding tag in https://github.com/skycoin/skycoin repository.
0. Ensure that the submodule at `vendor/github.com/SkycoinProject/skycoin` is in sync with respect to the corresponding tag in https://github.com/SkycoinProject/skycoin repository.
0. Update `CHANGELOG.md`: move the "unreleased" changes to the version and add the date.
0. Run `make docs` to regenerate documentation for all libraries and ensure they ar up-to-date.
0. Follow the steps in [pre-release testing](#pre-release-testing)
Expand Down Expand Up @@ -131,7 +131,7 @@ Follow the [Tor Project's instructions for verifying signatures](https://www.tor

If you can't or don't want to import the keys from a keyserver, the signing key is available in the repo: [gz-c.asc](gz-c.asc).

Releases and their signatures can be found on the [releases page](https://github.com/skycoin/skycoin/releases).
Releases and their signatures can be found on the [releases page](https://github.com/SkycoinProject/skycoin/releases).

Instructions for generating a PGP key, publishing it, signing the tags and binaries:
https://gist.github.com/gz-c/de3f9c43343b2f1a27c640fe529b067c
Expand All @@ -141,18 +141,18 @@ https://gist.github.com/gz-c/de3f9c43343b2f1a27c640fe529b067c
We have two branches: `master` and `develop`.

- `develop` is the default branch and will always have the latest code.
The submodule at `gopath/src/github.com/skycoin/skycoin` has to be
in sync with `skycoin/skycoin` `develop` branch.
The submodule at `gopath/src/github.com/SkycoinProject/skycoin` has to be
in sync with `SkycoinProject/skycoin` `develop` branch.
- `master` will always be equal to the current stable release on the website, and should correspond with the latest release tag.
The submodule at `gopath/src/github.com/skycoin/skycoin` has to be
in sync with `skycoin/skycoin` `master` branch.
The submodule at `gopath/src/github.com/SkycoinProject/skycoin` has to be
in sync with `SkycoinProject/skycoin` `master` branch.

Separate stable development branches will be created to work on releases for supporting the
most recent stable version of Skycoin. The name of these branches should be the Skycoin
major and minor version numbers followed by `dev` suffix e.g. `0.25dev`.
These branches may be forked out of either `master` or `develop` branches, and
the submodule at `gopath/src/github.com/skycoin/skycoin` has to be
in sync with the corresponding tag of `skycoin/skycoin` official repository.
the submodule at `gopath/src/github.com/SkycoinProject/skycoin` has to be
in sync with the corresponding tag of `SkycoinProject/skycoin` official repository.

Stable development branches are created most of the time for the following reasons:

Expand All @@ -165,12 +165,12 @@ Stable development branches are created most of the time for the following reaso

The following rules are enforced

- Contributions must comply to the development guidelines documented in the [Skycoin wiki](https://github.com/skycoin/skycoin/wiki).
- Contributions must comply to the development guidelines documented in the [Skycoin wiki](https://github.com/SkycoinProject/skycoin/wiki).
- C / C++ code must comply to the [Bitcoin C coding style](https://github.com/bitcoin/bitcoin/blob/master/doc/developer-notes.md#coding-style-c) (enforced by `clang-format`).

### SkyApi libcurl client for Skycoin REST API

This wrapper is auto-generated by `openapi-generator` directly from [Skycoin REST API code](https://github.com/skycoin/skycoin/tree/master/src/api).
This wrapper is auto-generated by `openapi-generator` directly from [Skycoin REST API code](https://github.com/SkycoinProject/skycoin/tree/master/src/api).

For further instructions see [Autogenerated documentation](./lib/curl/README.md).

Expand Down
2 changes: 1 addition & 1 deletion ci-scripts/add-key.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ security set-keychain-settings -t 3600 -u $KEY_CHAIN
# security import ./electron/ci-scripts/certs/dist.cer -k $KEY_CHAIN -T /usr/bin/codesign
# security import ./electron/ci-scripts/certs/dev.cer -k $KEY_CHAIN -T /usr/bin/codesign
echo "import distp12"
security import $GOPATH/src/github.com/skycoin/skycoin/ci-scripts/certs/dist.p12 -k $KEY_CHAIN -P $CERT_PWD -A /usr/bin/codesign
security import $GOPATH/src/github.com/SkycoinProject/skycoin/ci-scripts/certs/dist.p12 -k $KEY_CHAIN -P $CERT_PWD -A /usr/bin/codesign
# security import ./scripts/certs/dev.p12 -k $KEY_CHAIN -P DEVELOPMENT_KEY_PASSWORD -T /usr/bin/codesign
echo "set key partition list"
security set-key-partition-list -S apple-tool:,apple: -s -k travis $KEY_CHAIN
Expand Down
2 changes: 1 addition & 1 deletion include/cipher.testsuite.testsuite.go.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#define JSON_BIG_FILE_SIZE 32768

#define FILEPATH_SEPARATOR "/"
#define TEST_DATA_DIR "vendor/github.com/skycoin/skycoin/src/cipher/testsuite/testdata/"
#define TEST_DATA_DIR "vendor/github.com/SkycoinProject/skycoin/src/cipher/testsuite/testdata/"
#define MANY_ADDRESSES_FILENAME "many-addresses.golden"
#define INPUT_HASHES_FILENAME "input-hashes.golden"
#define SEED_FILE_REGEX "seed-\d+.golden"
Expand Down
8 changes: 4 additions & 4 deletions lib/cgo/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

# Skycoin C client library

[![Build Status](https://travis-ci.org/skycoin/skycoin.svg)](https://travis-ci.org/skycoin/skycoin)
[![GoDoc](https://godoc.org/github.com/skycoin/skycoin?status.svg)](https://godoc.org/github.com/skycoin/skycoin)
[![Go Report Card](https://goreportcard.com/badge/github.com/skycoin/skycoin)](https://goreportcard.com/report/github.com/skycoin/skycoin)
[![Build Status](https://travis-ci.org/SkycoinProject/skycoin.svg)](https://travis-ci.org/SkycoinProject/skycoin)
[![GoDoc](https://godoc.org/github.com/SkycoinProject/skycoin?status.svg)](https://godoc.org/github.com/SkycoinProject/skycoin)
[![Go Report Card](https://goreportcard.com/badge/github.com/SkycoinProject/skycoin)](https://goreportcard.com/report/github.com/SkycoinProject/skycoin)

Skycoin C client library (a.k.a libskycoin) provides access to Skycoin Core
internal and API functions for implementing third-party applications.
Expand Down Expand Up @@ -148,5 +148,5 @@ Follow these steps to generate API documentation.
- Install `moxygen` like so: `npm install moxygen -g`
- At the project top-level folder invoke `make docs-libc` (libskycoin docs only) or `make docs` (all docs).

`doxygen` and `moxygen` generate documentation for cryptographic API. Both are are pre-installed in [`skycoin/skycoindev-cli:develop`](https://hub.docker.com/r/skycoin/skycoindev-cli) Docker image.
`doxygen` and `moxygen` generate documentation for cryptographic API. Both are are pre-installed in [`SkycoinProject/skycoindev-cli:develop`](https://hub.docker.com/r/SkycoinProject/skycoindev-cli) Docker image.

4 changes: 2 additions & 2 deletions lib/cgo/api.client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"strings"
"unsafe"

api "github.com/skycoin/skycoin/src/api"
daemon "github.com/skycoin/skycoin/src/daemon"
api "github.com/SkycoinProject/skycoin/src/api"
daemon "github.com/SkycoinProject/skycoin/src/daemon"
)

/*
Expand Down
8 changes: 4 additions & 4 deletions lib/cgo/api.spend.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package main
import (
"unsafe"

"github.com/skycoin/skycoin/src/visor"
"github.com/SkycoinProject/skycoin/src/visor"

api "github.com/skycoin/skycoin/src/api"
cipher "github.com/skycoin/skycoin/src/cipher"
coin "github.com/skycoin/skycoin/src/coin"
api "github.com/SkycoinProject/skycoin/src/api"
cipher "github.com/SkycoinProject/skycoin/src/cipher"
coin "github.com/SkycoinProject/skycoin/src/coin"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/api.wallet.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package main

import api "github.com/skycoin/skycoin/src/api"
import api "github.com/SkycoinProject/skycoin/src/api"

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/cipher.address.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"unsafe"

cipher "github.com/skycoin/skycoin/src/cipher"
cipher "github.com/SkycoinProject/skycoin/src/cipher"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/cipher.base58.base58.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"unsafe"

"github.com/skycoin/skycoin/src/cipher/base58"
"github.com/SkycoinProject/skycoin/src/cipher/base58"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/cipher.bip32.bip32.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"unsafe"

"github.com/skycoin/skycoin/src/cipher/bip32"
"github.com/SkycoinProject/skycoin/src/cipher/bip32"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/cipher.bip32.path.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"unsafe"

"github.com/skycoin/skycoin/src/cipher/bip32"
"github.com/SkycoinProject/skycoin/src/cipher/bip32"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/cipher.bip39.bip39.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"unsafe"

"github.com/skycoin/skycoin/src/cipher/bip39"
"github.com/SkycoinProject/skycoin/src/cipher/bip39"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/cipher.bip44.bip44.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/skycoin/skycoin/src/cipher/bip44"
"github.com/SkycoinProject/skycoin/src/cipher/bip44"
)

/*
Expand Down
6 changes: 3 additions & 3 deletions lib/cgo/cipher.bitcoin.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"reflect"
"unsafe"

cipher "github.com/skycoin/skycoin/src/cipher"
cipher "github.com/SkycoinProject/skycoin/src/cipher"
)

/**
* Functions in github.com/skycoin/skycoin/src/cipher/bitcoin.go
* Functions in github.com/SkycoinProject/skycoin/src/cipher/bitcoin.go
*/

//export SKY_cipher_DecodeBase58BitcoinAddress
Expand Down Expand Up @@ -109,4 +109,4 @@ func SKY_cipher_BitcoinAddress_Checksum(_addr *C.cipher__BitcoinAddress, _arg0 *
addr := (*cipher.BitcoinAddress)(unsafe.Pointer(_addr))
cs := addr.Checksum()
C.memcpy(unsafe.Pointer(_arg0), unsafe.Pointer(&cs[0]), C.size_t(len(cs)))
}
}
6 changes: 3 additions & 3 deletions lib/cgo/cipher.crypto.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"unsafe"

cipher "github.com/skycoin/skycoin/src/cipher"
cipher "github.com/SkycoinProject/skycoin/src/cipher"
)

/*
Expand Down Expand Up @@ -174,7 +174,7 @@ func SKY_cipher_SigFromHex(_s string, _arg1 *C.cipher__Sig) (____error_code uint
func SKY_cipher_Sig_Hex(_s *C.cipher__Sig, _arg1 *C.GoString_) (____error_code uint32) {
s := (*cipher.Sig)(unsafe.Pointer(_s))
__arg1 := s.Hex()
copyString(__arg1,_arg1)
copyString(__arg1, _arg1)
return
}

Expand Down Expand Up @@ -291,7 +291,7 @@ func SKY_cipher_CheckSecKeyHash(_seckey *C.cipher__SecKey, _hash *C.cipher__SHA2
func SKY_cipher_Sig_String(_s *C.cipher__Sig, _arg1 *C.GoString_) (____error_code uint32) {
s := (*cipher.Sig)(unsafe.Pointer(_s))
__arg1 := s.String()
copyString(__arg1,_arg1)
copyString(__arg1, _arg1)
return
}

Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/cipher.encrypt.scrypt_chacha20poly1305.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"unsafe"

encrypt "github.com/skycoin/skycoin/src/cipher/encrypt"
encrypt "github.com/SkycoinProject/skycoin/src/cipher/encrypt"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/cipher.hash.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"unsafe"

cipher "github.com/skycoin/skycoin/src/cipher"
cipher "github.com/SkycoinProject/skycoin/src/cipher"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/cipher.secp256k1-go.secp256k1.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"reflect"
"unsafe"

"github.com/skycoin/skycoin/src/cipher/secp256k1-go"
"github.com/SkycoinProject/skycoin/src/cipher/secp256k1-go"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/cli.add_private_key.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
cli "github.com/skycoin/skycoin/src/cli"
cli "github.com/SkycoinProject/skycoin/src/cli"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/cli.check_balance.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"unsafe"

cli "github.com/skycoin/skycoin/src/cli"
cli "github.com/SkycoinProject/skycoin/src/cli"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/cli.cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"unsafe"

"github.com/skycoin/skycoin/src/cli"
"github.com/SkycoinProject/skycoin/src/cli"
)

/*
Expand Down
8 changes: 4 additions & 4 deletions lib/cgo/cli.create_rawtx.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package main
import (
"unsafe"

"github.com/skycoin/skycoin/src/transaction"
"github.com/SkycoinProject/skycoin/src/transaction"

cipher "github.com/skycoin/skycoin/src/cipher"
cli "github.com/skycoin/skycoin/src/cli"
coin "github.com/skycoin/skycoin/src/coin"
cipher "github.com/SkycoinProject/skycoin/src/cipher"
cli "github.com/SkycoinProject/skycoin/src/cli"
coin "github.com/SkycoinProject/skycoin/src/coin"
)

/*
Expand Down
4 changes: 2 additions & 2 deletions lib/cgo/cli.generate_addrs.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"reflect"
"unsafe"

cipher "github.com/skycoin/skycoin/src/cipher"
cli "github.com/skycoin/skycoin/src/cli"
cipher "github.com/SkycoinProject/skycoin/src/cipher"
cli "github.com/SkycoinProject/skycoin/src/cli"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/cli.generate_wallet.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
cli "github.com/skycoin/skycoin/src/cli"
cli "github.com/SkycoinProject/skycoin/src/cli"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion lib/cgo/cli.outputs.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
cli "github.com/skycoin/skycoin/src/cli"
cli "github.com/SkycoinProject/skycoin/src/cli"
)

/*
Expand Down
4 changes: 2 additions & 2 deletions lib/cgo/coin.block.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"reflect"
"unsafe"

cipher "github.com/skycoin/skycoin/src/cipher"
coin "github.com/skycoin/skycoin/src/coin"
cipher "github.com/SkycoinProject/skycoin/src/cipher"
coin "github.com/SkycoinProject/skycoin/src/coin"
)

/*
Expand Down
4 changes: 2 additions & 2 deletions lib/cgo/coin.outputs.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"reflect"
"unsafe"

"github.com/skycoin/skycoin/src/cipher"
coin "github.com/skycoin/skycoin/src/coin"
"github.com/SkycoinProject/skycoin/src/cipher"
coin "github.com/SkycoinProject/skycoin/src/coin"
)

/*
Expand Down
Loading

0 comments on commit 9796730

Please sign in to comment.